diff options
author | Martin Schwenke <martin@meltin.net> | 2014-06-24 11:29:58 +1000 |
---|---|---|
committer | Martin Schwenke <martin@meltin.net> | 2014-07-02 14:17:17 +1000 |
commit | 5828c885f007c8c73f9ff3fba48d9d1d8104eef2 (patch) | |
tree | 1c530d855217fa51ac578129a4984486b3a97279 /config.d | |
parent | b0c58b8a8fb72db26fa3c80979a666c46500e458 (diff) | |
download | autocluster-5828c885f007c8c73f9ff3fba48d9d1d8104eef2.tar.gz autocluster-5828c885f007c8c73f9ff3fba48d9d1d8104eef2.tar.xz autocluster-5828c885f007c8c73f9ff3fba48d9d1d8104eef2.zip |
Simplify setting of KS_RHEL_PACKAGES and KS_RHEL_SERVICES
The functions are unnecessary.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'config.d')
-rw-r--r-- | config.d/02kickstart.defconf | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/config.d/02kickstart.defconf b/config.d/02kickstart.defconf index a09dec4..61c0fcf 100644 --- 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 } |