From: Martin Schwenke <martin@meltin.net>
Date: Mon, 23 Jun 2014 04:04:36 +0000 (+1000)
Subject: Remove add_extra_package() and add_extra_chkconfig()
X-Git-Tag: autocluster-0.10~67
X-Git-Url: http://git.samba.org/samba.git/?p=autocluster.git;a=commitdiff_plain;h=0f3f0e8cc8dea4080cd5970df70312cd832e1df3

Remove add_extra_package() and add_extra_chkconfig()

These were a hack to get around EXTRA_PACKAGES having a default
non-empty value.  That's no longer true.

Just use EXTRA_PACKAGES and EXTRA_CHKCONFIGS directly.

Signed-off-by: Martin Schwenke <martin@meltin.net>
---

diff --git a/config.d/00base.defconf b/config.d/00base.defconf
index 0633adb..7d39f2f 100644
--- a/config.d/00base.defconf
+++ b/config.d/00base.defconf
@@ -568,26 +568,6 @@ defconf CREATE_BASE_TIMEOUT 3600 \
 
 ##############################
 
-# Note that this is only for RHEL packages available in Kickstart.
-# This is not for packages installed from a local repository!
-_EXTRA_RHEL_PACKAGES=""
-add_extra_package ()
-{
-
-    _EXTRA_RHEL_PACKAGES="${_EXTRA_RHEL_PACKAGES}
-$*"
-}
-
-add_extra_chkconfig ()
-{
-    local package="$1"
-    local state="$2"
-
-    EXTRA_CHKCONFIGS="${EXTRA_CHKCONFIGS}${EXTRA_CHKCONFIGS:+ }${package}:${state}"
-}
-
-##############################
-
 register_hook hack_nodes_functions hack_nodes_rhel_base
 
 hack_nodes_rhel_base ()
diff --git a/templates/nas-kickstart.cfg b/templates/nas-kickstart.cfg
index 88ca459..c3b2507 100644
--- a/templates/nas-kickstart.cfg
+++ b/templates/nas-kickstart.cfg
@@ -35,8 +35,6 @@ part swap --ondisk=@@SYSTEM_DISK_PREFIX@@a --size=@@SWAPSIZE@@
 
 @@@RHEL_PACKAGES@@@
 
-@@_EXTRA_RHEL_PACKAGES@@
-
 @@EXTRA_PACKAGES@@
 
 %end