diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-06-16 20:09:05 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2014-06-17 11:23:01 +1000 |
| commit | 6a6a6d44505c612c3bbd32e107a6da98e52a3290 (patch) | |
| tree | e437887762750c5038ed1747e67bdf20391308c2 /config.d | |
| parent | 63844cb4a516a6ee3bbf402f34232e833fad8775 (diff) | |
| download | autocluster-6a6a6d44505c612c3bbd32e107a6da98e52a3290.tar.gz autocluster-6a6a6d44505c612c3bbd32e107a6da98e52a3290.tar.xz autocluster-6a6a6d44505c612c3bbd32e107a6da98e52a3290.zip | |
Clean up RHEL package list generation
Signed-off-by: Martin Schwenke <martin@meltin.net>
Diffstat (limited to 'config.d')
| -rw-r--r-- | config.d/00base.defconf | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/config.d/00base.defconf b/config.d/00base.defconf index cc99ac1..e5530ad 100644 --- a/config.d/00base.defconf +++ b/config.d/00base.defconf @@ -367,11 +367,6 @@ rhel_print_iso () esac } -rhel_package_list () -{ - cat "$installdir/templates/RHEL${RHEL_VERSION%%.*}.packages" -} - # yum repo infrastructure _YUM_TEMPLATE="$installdir/templates/RHEL.repo" # Private - used below! rhel_gen_yum_repos () @@ -411,6 +406,11 @@ get_kvm_path () } +rhel_get_packages () +{ + echo "$installdir/templates/RHEL${RHEL_VERSION%%.*}.packages" +} + rhel_post_config_hook () { if [ "$ISO" = "@uto" ] ; then @@ -432,6 +432,10 @@ rhel_post_config_hook () if [ "$KVM" = "@uto" ] ; then KVM=$(get_kvm_path) || exit $? fi + + if [ "$RHEL_PACKAGES" = "@uto" ] ; then + RHEL_PACKAGES=$(rhel_get_packages) || exit $? + fi } register_hook post_config_hooks rhel_post_config_hook @@ -442,7 +446,7 @@ defconf RHEL_ARCH "x86_64" \ defconf RHEL_VERSION "6.2" \ "<version>" "version of Red Hat Enterprise Linux to configure" -defconf RHEL_PACKAGES "|rhel_package_list" +defconf RHEL_PACKAGES "@uto" defconf ISO_DIR "/virtual/ISO" \ "<dir>" "directory for ISO images, prepended to $ISO if not absolute" |