Simplify setting of KS_RHEL_PACKAGES and KS_RHEL_SERVICES

The functions are unnecessary.

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

diff --git a/config.d/02kickstart.defconf b/config.d/02kickstart.defconf
index a09dec4be4549d756dca3b4717b05f88d74652d4..61c0fcf804025a20069f6878e17fdaa607e69e75 100644 (file)
--- a/config.d/02kickstart.defconf
+++ b/config.d/02kickstart.defconf
@@ -33,24 +33,14 @@ defconf KS_KERNEL_OPTS "rhgb console=tty1 console=ttyS0,19200 nodmraid nompath"
 defconf KS_DONE_MESSAGE "you may safely reboot your system|System halted.|Power down." \
        "<string>" "string indicating kickstart install is complete"
 
-ks_get_packages ()
-{
-    echo "$installdir/templates/RHEL${RHEL_VERSION%%.*}.packages"
-}
-
-ks_get_services ()
-{
-    echo "$installdir/templates/RHEL${RHEL_VERSION%%.*}.services"
-}
-
 ks_post_config_hook ()
 {
     if [ "$KS_RHEL_PACKAGES" = "@uto" ] ; then
-       KS_RHEL_PACKAGES=$(ks_get_packages) || exit $?
+       KS_RHEL_PACKAGES="$installdir/templates/RHEL${RHEL_VERSION%%.*}.packages"
     fi
 
     if [ "$KS_RHEL_SERVICES" = "@uto" ] ; then
-       KS_RHEL_SERVICES=$(ks_get_services) || exit $?
+       KS_RHEL_SERVICES="$installdir/templates/RHEL${RHEL_VERSION%%.*}.services"
     fi
 }