Skip to content

Commit 4b7f3d8

Browse files
committed
remove error log during iso installation.
- log first mount failures attempt as debug instead error log. - When attended install is set, log attended installation is running. Signed-off-by: Unniche, BasavarajX <basavarajx.unniche@intel.com>
1 parent a2fe2b0 commit 4b7f3d8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function retry {
4747
while [ $retry -lt $limit ]
4848
do
4949
eval "$@" && break
50-
echo "$@" failed. Retrying...
50+
echo "$@" Retrying...
5151
((retry++))
5252
sleep $sleep_seconds
5353
done
@@ -83,7 +83,7 @@ else
8383
# the mount will fail and the retry loop would retry the mount repeatedly. This
8484
# is handled by the 'or' in the retry loop which will grep for the mount point and
8585
# break out of the loop if it is found.
86-
retry "{ mount -L $LABEL -o ro $ISO_ROOT || grep -qs $ISO_ROOT /proc/mounts ; }"
86+
retry "{ mount -L $LABEL -o ro $ISO_ROOT 2>/dev/null || grep -qs $ISO_ROOT /proc/mounts ; }"
8787
fi
8888

8989
# If we are running unattended (i.e., have $UNATTENDED_CONFIG_FILE), we need to make sure that we only run once.

toolkit/tools/liveinstaller/liveinstaller.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,12 +114,13 @@ func installerFactory(forceAttended bool, configFile, templateConfigFile string)
114114
unattendedExists, _ := file.PathExists(configFile)
115115

116116
if !unattendedExists {
117-
logger.Log.Infof("Config file (%s) does not exist, using attended installation", configFile)
117+
logger.Log.Debugf("Config file (%s) does not exist, using attended installation", configFile)
118118
isAttended = true
119119
}
120120
}
121121

122122
if isAttended {
123+
logger.Log.Info("attended_config exists, using attended installation")
123124
templateExists, _ := file.PathExists(templateConfigFile)
124125
if !templateExists {
125126
logger.Log.Panicf("Attended installation requires a template config file. Specified template (%s) does not exist.", templateConfigFile)

0 commit comments

Comments
 (0)