Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sdbootutil for openSUSE:Factory
checked in at 2024-08-30 13:25:45
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sdbootutil (Old)
and /work/SRC/openSUSE:Factory/.sdbootutil.new.2698 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sdbootutil"
Fri Aug 30 13:25:45 2024 rev:30 rq:1197503 version:1+git20240829.1b5aa4d
Changes:
--------
--- /work/SRC/openSUSE:Factory/sdbootutil/sdbootutil.changes 2024-08-29
15:43:03.448459111 +0200
+++ /work/SRC/openSUSE:Factory/.sdbootutil.new.2698/sdbootutil.changes
2024-08-30 13:25:59.314411476 +0200
@@ -1,0 +2,6 @@
+Thu Aug 29 17:19:24 UTC 2024 - apla...@suse.com
+
+- Update to version 1+git20240829.1b5aa4d:
+ * Add --default-snapshot parameter (bsc#1224773)
+
+-------------------------------------------------------------------
Old:
----
sdbootutil-1+git20240823.30ef4f1.obscpio
New:
----
sdbootutil-1+git20240829.1b5aa4d.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sdbootutil.spec ++++++
--- /var/tmp/diff_new_pack.h8fEMv/_old 2024-08-30 13:26:00.054442194 +0200
+++ /var/tmp/diff_new_pack.h8fEMv/_new 2024-08-30 13:26:00.054442194 +0200
@@ -27,7 +27,7 @@
%define git_version %{nil}
%endif
Name: sdbootutil
-Version: 1+git20240823.30ef4f1%{git_version}
+Version: 1+git20240829.1b5aa4d%{git_version}
Release: 0
Summary: script to install shim with sd-boot
License: MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.h8fEMv/_old 2024-08-30 13:26:00.110444518 +0200
+++ /var/tmp/diff_new_pack.h8fEMv/_new 2024-08-30 13:26:00.114444684 +0200
@@ -3,6 +3,6 @@
<param
name="url">https://github.com/lnussel/sdbootutil.git</param>
<param
name="changesrevision">708592a5033bb41d14e378172466ae9e90dfb3c4</param></service><service
name="tar_scm">
<param
name="url">https://github.com/openSUSE/sdbootutil.git</param>
- <param
name="changesrevision">30ef4f1b51f4ec7c5a14efd6560c1da122c65cce</param></service></servicedata>
+ <param
name="changesrevision">1b5aa4dff0d80c2b6871e3224fb1a5e8eb4d92f8</param></service></servicedata>
(No newline at EOF)
++++++ sdbootutil-1+git20240823.30ef4f1.obscpio ->
sdbootutil-1+git20240829.1b5aa4d.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sdbootutil-1+git20240823.30ef4f1/sdbootutil
new/sdbootutil-1+git20240829.1b5aa4d/sdbootutil
--- old/sdbootutil-1+git20240823.30ef4f1/sdbootutil 2024-08-23
10:54:27.000000000 +0200
+++ new/sdbootutil-1+git20240829.1b5aa4d/sdbootutil 2024-08-29
19:17:34.000000000 +0200
@@ -21,6 +21,7 @@
arg_no_random_seed=
arg_portable=
arg_only_default=
+arg_default_snapshot=
arg_ask_pin_or_pw=
arg_method=
arg_signed_policy=
@@ -88,6 +89,7 @@
--no-reuse-initrd Always regenerate initrd
--portable Handle bootloader on portable devices
--only-default Only list the default entry
+ --default-snapshot [SNAPSHOT] refers to the default
snapshot
--ask-pin Ask recovery PIN for re-enrollment
Ask TPM2 PIN when initial enrollment
--ask-pw Ask password when initial enrollment
@@ -503,7 +505,7 @@
local type date desc important pre_num
local snapshot_info
- update_snapper
+ [ -s "$snapperfile" ] || update_snapper
# shellcheck disable=SC2046
IFS="|" read -r type date desc important pre_num <<< \
@@ -1040,7 +1042,7 @@
list_snapshots()
{
[ -n "$have_snapshots" ] || { log_info "System does not support
snapshots."; return 0; }
- update_snapper 2>"$tmpfile" || err "$(cat "$tmpfile")"
+ [ -s "$snapperfile" ] || update_snapper 2>"$tmpfile" || err "$(cat
"$tmpfile")"
local n=0
while read -r n isdefault title; do
@@ -1313,8 +1315,6 @@
find_grub2()
{
- local prefix=""
- [ -z "$have_snapshots" ] ||
prefix="/.snapshots/${1-$root_snapshot}/snapshot"
local grub2
# The old grub.efi will contain the BLS patches, but we cannot
# use it because we also dropped the process of creating the
@@ -2411,7 +2411,7 @@
####### 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,ask-pin,ask-pw,method:,signed-policy
-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,portable,only-default,default-snapshot,ask-pin,ask-pw,method:,signed-policy
-n "${0##*/}" -- "$@")
eval set -- "$getopttmp"
while true ; do
@@ -2430,6 +2430,7 @@
--all) arg_all_entries=1; shift ;;
--portable) arg_portable=1; shift ;;
--only-default) arg_only_default=1; shift ;;
+ --default-snapshot) arg_default_snapshot=1; shift ;;
--ask-pin|--ask-pw) arg_ask_pin_or_pw=1; shift ;;
--method) arg_method="$2"; shift 2 ;;
--signed-policy) arg_signed_policy=1; shift ;;
@@ -2468,8 +2469,13 @@
fi
root_snapshot=""
if [ -n "$have_snapshots" ]; then
- root_snapshot="${root_subvol#"${subvol_prefix}"/.snapshots/}"
- root_snapshot="${root_snapshot%/snapshot}"
+ if [ -n "$arg_default_snapshot" ]; then
+ [ -s "$snapperfile" ] || update_snapper
+ read -r root_snapshot <<< "$(jq -r
'.root[]|select(.default==true)|.number' < "$snapperfile")"
+ else
+ root_snapshot="${root_subvol#"${subvol_prefix}"/.snapshots/}"
+ root_snapshot="${root_snapshot%/snapshot}"
+ fi
fi
if [ -n "$arg_esp_path" ] && [ "$boot_root" != "$arg_esp_path" ]; then
++++++ sdbootutil.obsinfo ++++++
--- /var/tmp/diff_new_pack.h8fEMv/_old 2024-08-30 13:26:00.254450496 +0200
+++ /var/tmp/diff_new_pack.h8fEMv/_new 2024-08-30 13:26:00.258450662 +0200
@@ -1,5 +1,5 @@
name: sdbootutil
-version: 1+git20240823.30ef4f1
-mtime: 1724403267
-commit: 30ef4f1b51f4ec7c5a14efd6560c1da122c65cce
+version: 1+git20240829.1b5aa4d
+mtime: 1724951854
+commit: 1b5aa4dff0d80c2b6871e3224fb1a5e8eb4d92f8
