diff options
| author | Martin Schwenke <martin@meltin.net> | 2014-06-16 16:05:01 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2014-06-25 20:46:15 +1000 |
| commit | 32c1902eb8094ab5ebc75b1e32cef6fe50ee483b (patch) | |
| tree | cad5128eb7e5ce35e26c0f5075a001b76cd1e6e0 | |
| parent | 7e890a0517c3804c0e07b24e34e3600e306e7d45 (diff) | |
| download | autocluster-32c1902eb8094ab5ebc75b1e32cef6fe50ee483b.tar.gz autocluster-32c1902eb8094ab5ebc75b1e32cef6fe50ee483b.tar.xz autocluster-32c1902eb8094ab5ebc75b1e32cef6fe50ee483b.zip | |
Remove INSTALLKEY configuration variable
RHEL 7.0 kickstart fails on "key" directive so remove this "feature".
We haven't actually used it for a long time. If needed then do it
post-kickstart.
Signed-off-by: Martin Schwenke <martin@meltin.net>
| -rwxr-xr-x | autocluster | 15 | ||||
| -rw-r--r-- | config.d/00base.defconf | 3 | ||||
| -rw-r--r-- | templates/nas-kickstart.cfg | 1 |
3 files changed, 0 insertions, 19 deletions
diff --git a/autocluster b/autocluster index 59678df..54e7462 100755 --- a/autocluster +++ b/autocluster @@ -569,21 +569,6 @@ create_base() echo "Creating kickstart file from template" substitute_vars "$KICKSTART" "tmp/ks.cfg" - if [ $INSTALLKEY = "--skip" ]; then - cat <<EOF --------------------------------------------------------------------------------------- -WARNING: You have not entered an install key. Some RHEL packages will not be installed. - -Please enter a valid RHEL install key in your config file like this: - - INSTALLKEY="1234-5678-0123-4567" - -The install will continue without an install key in 5 seconds --------------------------------------------------------------------------------------- -EOF - sleep 5 - fi - # $ISO gets $ISO_DIR prepended if it doesn't start with a leading '/'. case "$ISO" in (/*) : ;; diff --git a/config.d/00base.defconf b/config.d/00base.defconf index b41632d..e627f25 100644 --- a/config.d/00base.defconf +++ b/config.d/00base.defconf @@ -527,9 +527,6 @@ defconf EXTRA_PACKAGES '' \ defconf EXTRA_CHKCONFIGS "" \ "<chkconfigs>" "extra chkconfig commands to run in post-install" -defconf INSTALLKEY "--skip" \ - "<key>" "RHEL install key" - defconf STANDARD_POSTINSTALL "$installdir/templates/basic-postinstall.sh" \ "<file>" "standard kickstart postinstall script - change with care" diff --git a/templates/nas-kickstart.cfg b/templates/nas-kickstart.cfg index 23341d4..55b4b6a 100644 --- a/templates/nas-kickstart.cfg +++ b/templates/nas-kickstart.cfg @@ -3,7 +3,6 @@ install cdrom #ignoredisk --drives=[sdb,sdc,sdd,sde,sdf,sdg,sdh,sdi,sdj,sdk,sdl,sdm,sdn,sdo,sdp,sdq,sdr,sds,sdt,sdu,sdv,sdw,sdx,sdy,sdz,sdaa] -key @@INSTALLKEY@@ lang @@KS_LANGUAGE@@ keyboard @@KEYBOARD@@ skipx |