Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package sdbootutil for openSUSE:Factory
checked in at 2025-03-06 14:48:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sdbootutil (Old)
and /work/SRC/openSUSE:Factory/.sdbootutil.new.19136 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sdbootutil"
Thu Mar 6 14:48:27 2025 rev:50 rq:1250450 version:1+git20250305.278a563
Changes:
--------
--- /work/SRC/openSUSE:Factory/sdbootutil/sdbootutil.changes 2025-03-03
18:51:42.704898904 +0100
+++ /work/SRC/openSUSE:Factory/.sdbootutil.new.19136/sdbootutil.changes
2025-03-06 14:49:03.714277970 +0100
@@ -1,0 +2,16 @@
+Wed Mar 05 15:00:24 UTC 2025 - apla...@suse.com
+
+- Update to version 1+git20250305.278a563:
+ * Revert "Remove .conf suffix from grubenv (bsc#1237198)"
+ * Drop unused parentheses
+ * Fix name of local variable
+
+-------------------------------------------------------------------
+Tue Mar 04 14:40:22 UTC 2025 - apla...@suse.com
+
+- Update to version 1+git20250304.16b1e1b:
+ * Fix location of initial boot entries
+ * Set keyslot as local
+ * Style changes
+
+-------------------------------------------------------------------
Old:
----
sdbootutil-1+git20250303.63ae770.obscpio
New:
----
sdbootutil-1+git20250305.278a563.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sdbootutil.spec ++++++
--- /var/tmp/diff_new_pack.pAYhsI/_old 2025-03-06 14:49:04.842325276 +0100
+++ /var/tmp/diff_new_pack.pAYhsI/_new 2025-03-06 14:49:04.846325444 +0100
@@ -17,7 +17,7 @@
Name: sdbootutil
-Version: 1+git20250303.63ae770
+Version: 1+git20250305.278a563
Release: 0
Summary: bootctl wrapper for BLS boot loaders
License: MIT
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.pAYhsI/_old 2025-03-06 14:49:04.894327457 +0100
+++ /var/tmp/diff_new_pack.pAYhsI/_new 2025-03-06 14:49:04.898327624 +0100
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/openSUSE/sdbootutil.git</param>
- <param
name="changesrevision">63ae7701f471d708cfbf5214ff21b9480f33d01f</param></service></servicedata>
+ <param
name="changesrevision">278a563aa947ba134546b931c5f431f0e08c4a39</param></service></servicedata>
(No newline at EOF)
++++++ sdbootutil-1+git20250303.63ae770.obscpio ->
sdbootutil-1+git20250305.278a563.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sdbootutil-1+git20250303.63ae770/jeos-firstboot-enroll
new/sdbootutil-1+git20250305.278a563/jeos-firstboot-enroll
--- old/sdbootutil-1+git20250303.63ae770/jeos-firstboot-enroll 2025-03-03
16:30:55.000000000 +0100
+++ new/sdbootutil-1+git20250305.278a563/jeos-firstboot-enroll 2025-03-05
15:57:31.000000000 +0100
@@ -162,7 +162,7 @@
# Clean the enrollment key. disk-encryption-tool creates it
# in the keyslot 0 with the name "enrollment-key", that is
# showed by systemd-cryptenroll as "other"
- local slot
+ local slots
while read -r dev; do
slots=$(systemd-cryptenroll "$dev")
if grep -q "other" <<<"$slots"; then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sdbootutil-1+git20250303.63ae770/sdbootutil
new/sdbootutil-1+git20250305.278a563/sdbootutil
--- old/sdbootutil-1+git20250303.63ae770/sdbootutil 2025-03-03
16:30:55.000000000 +0100
+++ new/sdbootutil-1+git20250305.278a563/sdbootutil 2025-03-05
15:57:31.000000000 +0100
@@ -548,7 +548,7 @@
# shellcheck disable=SC2046
IFS="|" read -r type date desc important pre_num <<<\
$(jq -r --arg snapshot "$snapshot" \
- '.["root"][]|select(.number==(
$snapshot|tonumber))|[.type,.date,(.description|gsub("\\|";"_")),.userdata.important,."pre-number"//""]|join("|")'\
+
'.["root"][]|select(.number==($snapshot|tonumber))|[.type,.date,(.description|gsub("\\|";"_")),.userdata.important,."pre-number"//""]|join("|")'\
< "$snapperfile")
if [ -z "$desc" ] && [ "$type" = "post" ] && [ -n "$pre_num" ]; then
@@ -1477,8 +1477,7 @@
{
local id="${1:?}"
set_default_sdboot "$id"
- # Remove the ".conf" suffix (bsc#1237198)
- grubenv_set "default" "${id/%.conf/}"
+ grubenv_set "default" "$id"
}
set_default_entry()
@@ -1515,8 +1514,7 @@
{
local val
val="$(grubenv_get "default")"
- # Add ".conf" suffix if necessary (bsc#1237198)
- echo "${val/%.conf/}.conf"
+ echo "$val"
}
get_default_entry()
@@ -1770,7 +1768,7 @@
local initrd="$2"
local suffix="$3"
- local elements=( "$linux" "$initrd" )
+ local elements=("$linux" "$initrd")
local locks=()
local n=0
for element in "${elements[@]}"; do
@@ -1780,7 +1778,7 @@
--pcr=9 \
--pcrlock "$tmpdir/element-$n.pcrlock" \
"$element" 2> /dev/null || pcrlock_manual_raw 9
"$tmpdir/element-$n.pcrlock" "$element"
- locks+=( "$tmpdir/element-$n.pcrlock" )
+ locks+=("$tmpdir/element-$n.pcrlock")
done
jq --slurp '{"records": [.[].records[0]]}' \
"${locks[@]}" \
@@ -1806,7 +1804,7 @@
--pcr=8 \
--pcrlock "$tmpdir/line-$n.pcrlock" \
"$tmpdir/line"
- locks+=( "$tmpdir/line-$n.pcrlock" )
+ locks+=("$tmpdir/line-$n.pcrlock")
rm "$tmpdir/line"
done
jq --slurp '{"records": [.[].records[0]]}' \
@@ -1824,16 +1822,12 @@
local n=0
for i in "$base"/loader/entries/*.conf; do
n=$((n+1))
- if [ -n "$base" ]; then
- i="${i#/boot/efi}"
- i="$base$i"
- fi
pcrlock \
lock-raw \
--pcr=9 \
--pcrlock="$tmpdir/entry-$n.pcrlock" \
"$i"
- locks+=( "$tmpdir/entry-$n.pcrlock" )
+ locks+=("$tmpdir/entry-$n.pcrlock")
done
jq --slurp '{"records": [.[].records[0]]}' \
@@ -1880,8 +1874,8 @@
}
n=$((n+1))
pcrlock_sdboot_cmdline_initrd "initrd=$cmdline"
"${boot_root}$initrd" "$n"
- done < <(jq --raw-output '.[] | ([(.initrd[0] | sub("/"; "\\"; "g")),
.options] | join(" ")), .initrd[0]' "$entryfile"
-)
+ done < <(jq --raw-output '.[] | ([(.initrd[0] | sub("/"; "\\"; "g")),
.options] | join(" ")), .initrd[0]' "$entryfile")
+
# Generate variation for 710-kernel-cmdline-initrd-entry
# component that contains the current cmdline and the current
# initrd, even if this will never be used again. This is
@@ -2335,7 +2329,7 @@
cryptsetup isLuks --type luks2 "$dev" || continue
[ -e /etc/crypttab ] && grep -E -q
"${dev}[[:space:]].*x-sdbootutil.ignore" /etc/crypttab && continue
[ -e /etc/crypttab ] && grep -E -q
"${uuid}[[:space:]].*x-sdbootutil.ignore" /etc/crypttab && continue
- tracked_devices+=("$dev")
+ tracked_devices+="$dev"
done < <(lsblk --noheadings -o PATH,FSTYPE,UUID)
have_tracked_devices
}
@@ -2603,7 +2597,7 @@
tmp_key="$(systemd-cryptenroll --wipe-slot=recovery
--recovery-key "${extra_args[@]}" "$dev" 2> /dev/null)"
local split
read -r -a split < <(systemd-cryptenroll "$dev" | grep recovery)
- keyslot="${split[0]}"
+ local keyslot="${split[0]}"
# cryptsetup can only read the new passphrase from a
# keyfile
local tmp_key_file
++++++ sdbootutil.obsinfo ++++++
--- /var/tmp/diff_new_pack.pAYhsI/_old 2025-03-06 14:49:05.030333161 +0100
+++ /var/tmp/diff_new_pack.pAYhsI/_new 2025-03-06 14:49:05.038333496 +0100
@@ -1,5 +1,5 @@
name: sdbootutil
-version: 1+git20250303.63ae770
-mtime: 1741015855
-commit: 63ae7701f471d708cfbf5214ff21b9480f33d01f
+version: 1+git20250305.278a563
+mtime: 1741186651
+commit: 278a563aa947ba134546b931c5f431f0e08c4a39
