Skip to content

[release-4.18] OCPBUGS-51198: Remove MicroShift Greenboot Fail Marker on first check start #4597

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
openshift-merge-bot merged 1 commit into from
Feb 25, 2025
Merged

[release-4.18] OCPBUGS-51198: Remove MicroShift Greenboot Fail Marker on first check start #4597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 8 additions & 0 deletions packaging/greenboot/functions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,14 @@ function create_fail_marker_and_exit() {
exit 1
}

# Clear fail marker
function clear_fail_marker() {
if [ -f "${MICROSHIFT_GREENBOOT_FAIL_MARKER}" ]; then
>&2 echo "'${MICROSHIFT_GREENBOOT_FAIL_MARKER}' file exists - removing"
rm -f "${MICROSHIFT_GREENBOOT_FAIL_MARKER}"
fi
}

# Run a command with a second delay until it returns a zero exit status
#
# arg1: Time in seconds to wait for a command to succeed
Expand Down
2 changes: 2 additions & 0 deletions packaging/greenboot/microshift-running-check.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ if [ "$(id -u)" -ne 0 ] ; then
exit 1
fi

clear_fail_marker

echo "STARTED"

# Print the boot variable status
Expand Down