Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package sdbootutil for openSUSE:Factory checked in at 2026-04-09 16:08:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sdbootutil (Old) and /work/SRC/openSUSE:Factory/.sdbootutil.new.21863 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sdbootutil" Thu Apr 9 16:08:30 2026 rev:99 rq:1345263 version:1+git20260408.db91528 Changes: -------- --- /work/SRC/openSUSE:Factory/sdbootutil/sdbootutil.changes 2026-04-07 16:47:26.304903032 +0200 +++ /work/SRC/openSUSE:Factory/.sdbootutil.new.21863/sdbootutil.changes 2026-04-09 16:10:23.371108204 +0200 @@ -1,0 +2,8 @@ +Wed Apr 08 18:07:32 UTC 2026 - Alberto Planas Dominguez <[email protected]> + +- Update to version 1+git20260408.db91528: + * Find /etc/os-release and machine-id in mkosi + * Drop reference to systemd-experimental + * Fix set-default-snapshot when snapshots are not present + +------------------------------------------------------------------- Old: ---- sdbootutil-1+git20260407.f1134c1.obscpio New: ---- sdbootutil-1+git20260408.db91528.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sdbootutil.spec ++++++ --- /var/tmp/diff_new_pack.Xz4CDP/_old 2026-04-09 16:10:26.579240562 +0200 +++ /var/tmp/diff_new_pack.Xz4CDP/_new 2026-04-09 16:10:26.583240727 +0200 @@ -18,7 +18,7 @@ %global rustflags '-Clink-arg=-Wl,-z,relro,-z,now' Name: sdbootutil -Version: 1+git20260407.f1134c1 +Version: 1+git20260408.db91528 Release: 0 Summary: Bootctl wrapper for BLS boot loaders License: MIT @@ -44,7 +44,7 @@ Requires: tpm2.0-tools Requires: libtss2-tcti-device0 # For bootctl and systemd-pcrlock -Requires: (udev >= 257.9 or systemd-experimental < 257.9) +Requires: udev Supplements: (grub2-x86_64-efi-bls and shim) Supplements: (systemd-boot and shim) # Because uhmac it is not a noarch package ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.Xz4CDP/_old 2026-04-09 16:10:26.647243367 +0200 +++ /var/tmp/diff_new_pack.Xz4CDP/_new 2026-04-09 16:10:26.651243532 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/sdbootutil.git</param> - <param name="changesrevision">f1134c1f6d97ee2e6005fee8d66ca7d50b2391b8</param></service></servicedata> + <param name="changesrevision">db91528723411fcb53942737a61d0febd44e94f0</param></service></servicedata> (No newline at EOF) ++++++ sdbootutil-1+git20260407.f1134c1.obscpio -> sdbootutil-1+git20260408.db91528.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sdbootutil-1+git20260407.f1134c1/sdbootutil new/sdbootutil-1+git20260408.db91528/sdbootutil --- old/sdbootutil-1+git20260407.f1134c1/sdbootutil 2026-04-07 13:24:44.000000000 +0200 +++ new/sdbootutil-1+git20260408.db91528/sdbootutil 2026-04-08 20:05:12.000000000 +0200 @@ -865,7 +865,7 @@ { local snapshot="$1" local subvol="" - [ -z "$snapshot" ] || subvol="${subvol_prefix}/.snapshots/${snapshot}/snapshot" + [ -z "$have_snapshots" ] || subvol="${subvol_prefix}/.snapshots/${snapshot}/snapshot" os_release_files=( "${subvol#"${subvol_prefix}"}/usr/lib/os-release" "${subvol#"${subvol_prefix}"}/etc/os-release" @@ -882,7 +882,7 @@ { local snapshot="$1" local subvol="" - [ -z "$snapshot" ] || subvol="${subvol_prefix}/.snapshots/${snapshot}/snapshot" + [ -z "$have_snapshots" ] || subvol="${subvol_prefix}/.snapshots/${snapshot}/snapshot" machine_id_files=() if is_transactional && [ -z "$TRANSACTIONAL_UPDATE" ]; then [ -n "$snapshot" ] && machine_id_files+=("/var/lib/overlay/$snapshot/etc/machine-id") @@ -2114,9 +2114,39 @@ fi } +get_top_entry_id() +{ + local snapshot="$1" + + if [ -n "$snapshot" ]; then + update_entries_for_snapshot "$snapshot" + else + update_entries_for_this_system + fi + + mapfile -t ids < <(jq -r '.[]|.id' < "$entryfile") + if [ -z "${ids[0]}" ]; then + info "No boot entries found, trying to create them..." + install_all_kernels "$snapshot" + if [ -n "$snapshot" ]; then + update_entries_for_snapshot "$snapshot" + else + update_entries_for_this_system + fi + + mapfile -t ids < <(jq -r '.[]|.id' < "$entryfile") + if [ -z "${ids[0]}" ]; then + err "snapshot $snapshot has no kernels" + fi + fi + + echo "${ids[0]}" +} + set_default_entry() { - local id="${1:?}" + local id="$1" + [ -n "$1" ] || id=$(get_top_entry_id "$root_snapshot") info "Setting default entry $id" @@ -2290,9 +2320,18 @@ set_default_snapshot() { - [ -n "$have_snapshots" ] || { info "System does not support snapshots."; return 0; } + [ -n "$have_snapshots" ] || { + info "System does not support snapshots." + # suse-module-tools is calling `sdbootutil + # set-default-snapshot` to set the top entry as the + # default entry. If the system does not support + # snapshots we set the top entry as default and exit + # early + set_default_entry + return 0 + } local snapshot="${1:?}" - local configs + local id info "Setting default snapshot $snapshot" @@ -2301,19 +2340,8 @@ return 0 } - update_entries_for_snapshot "$snapshot" - mapfile configs < <(jq '.[]|[.id]|join(" ")' -r < "$entryfile") - configs=("${configs[@]%$nl}") - if [ -z "${configs[0]}" ]; then - info "Snapshot $snapshot has no configs, trying to create them..." - install_all_kernels "$snapshot" - update_entries_for_snapshot "$snapshot" - mapfile configs < <(jq '.[]|[.id]|join(" ")' -r < "$entryfile") - configs=("${configs[@]%$nl}") - if [ -z "${configs[0]}" ]; then - err "snapshot $snapshot has no kernels" - fi - fi + id="$(get_top_entry_id "$snapshot")" + set_default_entry "$id" # The default snapshot is not the criteria used for the # bootloader to select the default boot entry, but for @@ -2326,8 +2354,6 @@ read -r _ subvolume_id _ < <(btrfs subvolume list -o /.snapshots | grep "${subvol_prefix}/.snapshots/$snapshot/snapshot") btrfs subvolume set-default "${subvolume_id}" /.snapshots rm -f "$snapperfile" - - set_default_entry "${configs[0]}" } have_pcrlock() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sdbootutil-1+git20260407.f1134c1/sdbootutil.spec new/sdbootutil-1+git20260408.db91528/sdbootutil.spec --- old/sdbootutil-1+git20260407.f1134c1/sdbootutil.spec 2026-04-07 13:24:44.000000000 +0200 +++ new/sdbootutil-1+git20260408.db91528/sdbootutil.spec 2026-04-08 20:05:12.000000000 +0200 @@ -44,7 +44,7 @@ Requires: tpm2.0-tools Requires: libtss2-tcti-device0 # For bootctl and systemd-pcrlock -Requires: (udev >= 257.9 or systemd-experimental < 257.9) +Requires: udev Supplements: (grub2-x86_64-efi-bls and shim) Supplements: (systemd-boot and shim) # Because uhmac it is not a noarch package ++++++ sdbootutil.obsinfo ++++++ --- /var/tmp/diff_new_pack.Xz4CDP/_old 2026-04-09 16:10:26.855251949 +0200 +++ /var/tmp/diff_new_pack.Xz4CDP/_new 2026-04-09 16:10:26.859252114 +0200 @@ -1,5 +1,5 @@ name: sdbootutil -version: 1+git20260407.f1134c1 -mtime: 1775561084 -commit: f1134c1f6d97ee2e6005fee8d66ca7d50b2391b8 +version: 1+git20260408.db91528 +mtime: 1775671512 +commit: db91528723411fcb53942737a61d0febd44e94f0
