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 0633adbbb60c5123d7ce93cb9aa3c38ebddcb48a..7d39f2fb03e3edba68e1981ee1be53f2d683fe78 100644 (file)
--- 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 88ca45980281b476f35ade051643ea65fd6849e7..c3b2507bff08e10ea0be9e787fe2797e5c398da9 100644 (file)
--- 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