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-10-27 16:46:22 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sdbootutil (Old) and /work/SRC/openSUSE:Factory/.sdbootutil.new.2252680 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sdbootutil" Tue Oct 27 16:46:22 2026 rev:115 rq:1392715 version:1+git20261026.4e266f0 Changes: -------- --- /work/SRC/openSUSE:Factory/sdbootutil/sdbootutil.changes 2026-10-20 12:57:16.715117287 +0200 +++ /work/SRC/openSUSE:Factory/.sdbootutil.new.2252680/sdbootutil.changes 2026-10-27 16:46:26.899162688 +0100 @@ -1,0 +2,8 @@ +Mon Oct 26 11:51:26 UTC 2026 - Alberto Planas Dominguez <[email protected]> + +- Update to version 1+git20261026.4e266f0: + * Add --version parameter + * Do not propagate umount to the host + * Do not add duplicate cmdline.d entries + +------------------------------------------------------------------- Old: ---- sdbootutil-1+git20261007.53bc127.obscpio New: ---- sdbootutil-1+git20261026.4e266f0.obscpio ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sdbootutil.spec ++++++ --- /var/tmp/diff_new_pack.o5FkU1/_old 2026-10-27 16:46:27.784199759 +0100 +++ /var/tmp/diff_new_pack.o5FkU1/_new 2026-10-27 16:46:27.786199843 +0100 @@ -55,7 +55,7 @@ %{nil} Name: sdbootutil -Version: 1+git20261007.53bc127 +Version: 1+git20261026.4e266f0 Release: 0 Summary: Bootctl wrapper for BLS boot loaders License: MIT @@ -182,6 +182,8 @@ %install install -D -m 755 %{name} %{buildroot}%{_bindir}/%{name} +sed -i 's/^version=git$/version="%{version}"/' %{buildroot}%{_bindir}/%{name} +grep -q '^version="%{version}"$' %{buildroot}%{_bindir}/%{name} # Install uhmac binary pushd uhmac ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.o5FkU1/_old 2026-10-27 16:46:27.832201769 +0100 +++ /var/tmp/diff_new_pack.o5FkU1/_new 2026-10-27 16:46:27.837201979 +0100 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/openSUSE/sdbootutil.git</param> - <param name="changesrevision">53bc1271fcf2b544baafbc9bedd29d0494b9713a</param></service></servicedata> + <param name="changesrevision">4e266f09ced4ed9a44f290f2cb34b91bae9ac6ef</param></service></servicedata> (No newline at EOF) ++++++ sdbootutil-1+git20261007.53bc127.obscpio -> sdbootutil-1+git20261026.4e266f0.obscpio ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sdbootutil-1+git20261007.53bc127/sdbootutil new/sdbootutil-1+git20261026.4e266f0/sdbootutil --- old/sdbootutil-1+git20261007.53bc127/sdbootutil 2026-10-07 14:13:20.000000000 +0200 +++ new/sdbootutil-1+git20261026.4e266f0/sdbootutil 2026-10-26 12:44:49.000000000 +0100 @@ -33,6 +33,9 @@ DEBUG_LOG="/var/log/sdbootutil.log" verbose= +# Replaced with the package version by the spec file +version=git + # The trace can record secrets (passwords and PINs passed as command # line arguments to the tools that this script calls), so the log is # created 0600 and never with whatever the umask happens to be @@ -283,6 +286,7 @@ (verbose output is enabled) --stop-trace-code Remove /var/log/sdbootutil.log to stop tracing the code -h, --help This screen + --version Print the version and exit COMMAND: bootloader [SNAPSHOT] @@ -1520,6 +1524,9 @@ # properly detect the fs type and load the relevant module. findmnt -o TARGET,FSTYPE,FSROOT -Rv --json / > "$tmpdir/mounts" mount --bind "$snapshot_dir" "$snapshot_dir" + # The bind is a peer of the shared /.snapshots mount, and every + # mount below it would be propagated to the host too + mount --make-slave "$snapshot_dir" # Register the chroot before mounting anything else, so a # failure in the middle of the loop is unwound by `cleanup` chroot_dir="$snapshot_dir" @@ -1564,6 +1571,10 @@ { local snapshot_dir="$1" + # The binds are peers of the host mounts, and they receive the + # ones that the host creates meanwhile (like a FUSE mount in + # /home). Unmounting those copies would unmount the originals + mount --make-rslave "$snapshot_dir" umount -R "$snapshot_dir" chroot_dir= } @@ -1922,16 +1933,25 @@ break done + local usr_dropins=("${subvol:1}"/usr/kernel/cmdline.d/*) + local etc_dropins=("${subvol:1}"/etc/kernel/cmdline.d/*) + # For the running snapshot, and when there are no snapshots, the + # subvolume is "/", and its drop-ins would be read twice + if ! [ "${subvol:1}/" -ef / ]; then + usr_dropins+=(/usr/kernel/cmdline.d/*) + etc_dropins+=(/etc/kernel/cmdline.d/*) + fi + # A drop-in in "/etc" replaces the one with the same name in # "/usr", and an empty one is a way of masking it - for i in "${subvol:1}"/usr/kernel/cmdline.d/* /usr/kernel/cmdline.d/*; do + for i in "${usr_dropins[@]}"; do [ -e "${subvol:1}/etc/kernel/cmdline.d/$(basename "$i")" ] && continue [ -s "$i" ] || continue echo "$i" found=1 done - for i in "${subvol:1}"/etc/kernel/cmdline.d/* /etc/kernel/cmdline.d/*; do + for i in "${etc_dropins[@]}"; do [ -s "$i" ] || continue echo "$i" found=1 @@ -7712,6 +7732,7 @@ define_options() { declare -gA options_with_arg=( [help]="" + [version]="" [verbose]="" [start-trace-code]="" [stop-trace-code]="" @@ -7778,6 +7799,7 @@ while true ; do case "$1" in -h|--help) helpandquit ;; + --version) echo "sdbootutil $version"; exit 0 ;; -v|--verbose) verbose=$((++verbose)); shift ;; --start-trace-code) shift ;; --stop-trace-code) shift ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sdbootutil-1+git20261007.53bc127/sdbootutil.spec new/sdbootutil-1+git20261026.4e266f0/sdbootutil.spec --- old/sdbootutil-1+git20261007.53bc127/sdbootutil.spec 2026-10-07 14:13:20.000000000 +0200 +++ new/sdbootutil-1+git20261026.4e266f0/sdbootutil.spec 2026-10-26 12:44:49.000000000 +0100 @@ -182,6 +182,8 @@ %install install -D -m 755 %{name} %{buildroot}%{_bindir}/%{name} +sed -i 's/^version=git$/version="%{version}"/' %{buildroot}%{_bindir}/%{name} +grep -q '^version="%{version}"$' %{buildroot}%{_bindir}/%{name} # Install uhmac binary pushd uhmac ++++++ sdbootutil.obsinfo ++++++ --- /var/tmp/diff_new_pack.o5FkU1/_old 2026-10-27 16:46:28.061211362 +0100 +++ /var/tmp/diff_new_pack.o5FkU1/_new 2026-10-27 16:46:28.069211697 +0100 @@ -1,5 +1,5 @@ name: sdbootutil -version: 1+git20261007.53bc127 -mtime: 1791375200 -commit: 53bc1271fcf2b544baafbc9bedd29d0494b9713a +version: 1+git20261026.4e266f0 +mtime: 1793015089 +commit: 4e266f09ced4ed9a44f290f2cb34b91bae9ac6ef
