Skip to content
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

Jump to bottom

rollback bootloader after setting default snapshot #102

Closed
wants to merge 2 commits into from
Closed

rollback bootloader after setting default snapshot #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e5d985
rollback bootloader after setting default snapshot
Jun 22, 2024
3240b10
Merge branch 'main' into rollback_bootloader
aplanas Oct 30, 2024
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
2 changes: 1 addition & 1 deletion 10-sdbootutil.snapper
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ set_default_snapshot()

if is_transactional; then
/usr/bin/sdbootutil add-all-kernels "$num" || :
aplanas marked this conversation as resolved.
Show resolved Hide resolved
/usr/bin/sdbootutil update "$num" || :

if [ -e /usr/lib/module-init-tools/regenerate-initrd-posttrans ]; then
/usr/lib/module-init-tools/regenerate-initrd-posttrans
fi
fi

/usr/bin/sdbootutil set-default-snapshot "$num" || :
/usr/bin/sdbootutil update --sync "$num"
}

h()
Expand Down
35 changes: 29 additions & 6 deletions sdbootutil
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ arg_no_variables=
arg_no_reuse_initrd=
arg_no_random_seed=
arg_portable=
arg_sync=
aplanas marked this conversation as resolved.
Show resolved Hide resolved
arg_only_default=
arg_default_snapshot=
arg_ask_pin_or_pw=
Expand Down Expand Up @@ -91,6 +92,7 @@ helpandquit()
--entry-keys Comma separated list of keys
--no-variables Do not update UEFI variables
--no-reuse-initrd Always regenerate initrd
--sync Do not only update, but also downgrade
--portable Handle bootloader on portable devices
--only-default Only list the default entry
--default-snapshot [SNAPSHOT] refers to the default snapshot
Expand Down Expand Up @@ -157,7 +159,8 @@ helpandquit()
Check whether the bootloader in ESP needs updating

update
Update the bootloader if it's old
Update the bootloader if it's older than the deployed version.
Use the --sync option to replace the deployed version also when it's newer

force-update
Update the bootloader in any case
Expand Down Expand Up @@ -1471,10 +1474,18 @@ bootloader_needs_update()
nv="$(bootloader_version "$(find_bootloader "$snapshot")")"
[ -n "$v" ] || return 1
log_info "system version $nv"
systemd-analyze compare-versions "$v" lt "$nv" 2>/dev/null || return 1
systemd-analyze compare-versions "$v" "$nv" 2>/dev/null
local status="$?"
bldr_name=$(bootloader_name "$snapshot")
log_info "$bldr_name needs to be updated"
return 0
if [ "$status" == "11" ]; then
aplanas marked this conversation as resolved.
Show resolved Hide resolved
log_info "$bldr_name needs to be updated"
return 0
elif [ "$status" == "12" ]; then
log_info "$bldr_name is newer than system bootloader"
return 2
fi
log_info "$bldr_name is already up-to-date"
return 1
}

install_bootloader()
Expand Down Expand Up @@ -1556,6 +1567,17 @@ install_bootloader()
update_predictions=1
}

bootloader_update()
{
local status=0
bootloader_needs_update "${1:-$root_snapshot}" || status=$?
if [[ $status -eq 0 ]]; then
aplanas marked this conversation as resolved.
Show resolved Hide resolved
install_bootloader "${1:-$root_snapshot}"
elif [ -n "$arg_sync" ] && [[ $status -eq 2 ]]; then
aplanas marked this conversation as resolved.
Show resolved Hide resolved
install_bootloader "${1:-$root_snapshot}"
fi
}

hex_to_binary()
{
local s="$1"
Expand Down Expand Up @@ -2707,7 +2729,7 @@ main_menu()

####### main #######

getopttmp=$(getopt -o hc:v --long help,flicker,verbose,esp-path:,entry-token:,arch:,image:,entry-keys:,no-variables,no-reuse-initrd,no-random-seed,all,portable,only-default,default-snapshot,ask-pin,ask-pw,method:,signed-policy,generate-pin,unlock: -n "${0##*/}" -- "$@")
getopttmp=$(getopt -o hc:v --long help,flicker,verbose,esp-path:,entry-token:,arch:,image:,entry-keys:,no-variables,no-reuse-initrd,no-random-seed,all,sync,portable,only-default,default-snapshot,ask-pin,ask-pw,method:,signed-policy,generate-pin,unlock: -n "${0##*/}" -- "$@")
eval set -- "$getopttmp"

while true ; do
Expand All @@ -2724,6 +2746,7 @@ while true ; do
--no-reuse-initrd) arg_no_reuse_initrd=1; shift ;;
--no-random-seed) arg_no_random_seed=1; shift ;;
--all) arg_all_entries=1; shift ;;
--sync) arg_sync=1; shift ;;
--portable) arg_portable=1; shift ;;
--only-default) arg_only_default=1; shift ;;
--default-snapshot) arg_default_snapshot=1; shift ;;
Expand Down Expand Up @@ -2824,7 +2847,7 @@ if [ "$1" = "install" ]; then
elif [ "$1" = "needs-update" ]; then
bootloader_needs_update "${2:-$root_snapshot}"
elif [ "$1" = "update" ]; then
if bootloader_needs_update "${2:-$root_snapshot}"; then install_bootloader "${2:-$root_snapshot}"; else :; fi
bootloader_update "${2:-$root_snapshot}"
elif [ "$1" = "force-update" ]; then
if is_installed; then install_bootloader "${2:-$root_snapshot}"; else :; fi
elif [ "$1" = "bootloader" ]; then
Expand Down