Skip to content

firmware: don't reboot into a half-applied major upgrade #10647

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

Closed
cclements wants to merge 1 commit into from
Closed

firmware: don't reboot into a half-applied major upgrade #10647

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
11 changes: 10 additions & 1 deletion src/etc/rc.syshook.d/early/05-upgrade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@
# Perform major updates

for STAGE in K B P; do
if opnsense-update -${STAGE}; then
opnsense-update -${STAGE}
STATUS=${?}

if [ "${STATUS}" -eq 0 ]; then
echo "Rebooting now."
reboot
break
elif [ "${STATUS}" -ne 1 ]; then
# the stage was pending but could not be applied; the
# stages behind it must not run on top of the damage
echo "Upgrade stage ${STAGE} failed (${STATUS}), aborting."
break
fi
done
8 changes: 4 additions & 4 deletions src/opnsense/scripts/firmware/upgrade.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,11 @@ REQUEST="UPGRADE"

if output_cmd opnsense-update -u; then
if output_cmd /usr/local/etc/rc.syshook upgrade; then
# pending kernel applies before reboot
if output_cmd opnsense-update -K -c; then
output_cmd opnsense-update -K
# pending kernel applies before reboot, but if that apply
# fails rebooting would only make matters worse
if ! output_cmd opnsense-update -K -c || output_cmd opnsense-update -K; then
output_reboot keep-log
fi
output_reboot keep-log
fi

output_txt "The upgrade was aborted due to an error."
Expand Down