Skip to content

remove error log during iso installation. #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
anujm1 merged 3 commits into from
May 23, 2025
Merged

remove error log during iso installation. #68

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5650a45
remove error log during iso installation.
bunnichx Apr 28, 2025
f30ea91
Merge branch '3.0-dev' into iso-log-correction
anujm1 May 21, 2025
5ea7c0a
Merge branch '3.0-dev' into iso-log-correction
anujm1 May 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions toolkit/resources/imageconfigs/additionalfiles/iso_initrd/root/runliveinstaller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ function retry {
while [ $retry -lt $limit ]
do
eval "$@" && break
echo "$@" failed. Retrying...
echo "$@" Retrying...
((retry++))
sleep $sleep_seconds
done
Expand Down Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion toolkit/tools/liveinstaller/liveinstaller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
Expand All @@ -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 {
Expand Down