diff --git a/toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller b/toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller index 22cb4741cc..e70d96fb53 100755 --- a/toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller +++ b/toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller @@ -47,7 +47,7 @@ function retry { while [ $retry -lt $limit ] do eval "$@" && break - echo "$@" failed. Retrying... + echo "$@" Retrying... ((retry++)) sleep $sleep_seconds done @@ -83,7 +83,7 @@ else # the mount will fail and the retry loop would retry the mount repeatedly. This # is handled by the 'or' in the retry loop which will grep for the mount point and # break out of the loop if it is found. - retry "{ mount -L $LABEL -o ro $ISO_ROOT || grep -qs $ISO_ROOT /proc/mounts ; }" + retry "{ mount -L $LABEL -o ro $ISO_ROOT 2>/dev/null || grep -qs $ISO_ROOT /proc/mounts ; }" fi # If we are running unattended (i.e., have $UNATTENDED_CONFIG_FILE), we need to make sure that we only run once. diff --git a/toolkit/tools/liveinstaller/liveinstaller.go b/toolkit/tools/liveinstaller/liveinstaller.go index 7348c8f77d..6765b188c5 100644 --- a/toolkit/tools/liveinstaller/liveinstaller.go +++ b/toolkit/tools/liveinstaller/liveinstaller.go @@ -114,7 +114,7 @@ func installerFactory(forceAttended bool, configFile, templateConfigFile string) unattendedExists, _ := file.PathExists(configFile) if !unattendedExists { - logger.Log.Infof("Config file (%s) does not exist, using attended installation", configFile) + logger.Log.Debugf("Config file (%s) does not exist, using attended installation", configFile) isAttended = true } } @@ -124,6 +124,7 @@ func installerFactory(forceAttended bool, configFile, templateConfigFile string) if !templateExists { logger.Log.Panicf("Attended installation requires a template config file. Specified template (%s) does not exist.", templateConfigFile) } + logger.Log.Info("attended_config exists, using attended installation") } if isAttended {