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-13 13:22:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/sdbootutil (Old)
and /work/SRC/openSUSE:Factory/.sdbootutil.new.7232 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sdbootutil"
Tue Aug 13 13:22:23 2024 rev:27 rq:1193395 version:1+git20240812.ee2298f
Changes:
--------
--- /work/SRC/openSUSE:Factory/sdbootutil/sdbootutil.changes 2024-07-22
17:14:34.469057052 +0200
+++ /work/SRC/openSUSE:Factory/.sdbootutil.new.7232/sdbootutil.changes
2024-08-13 13:22:33.512532761 +0200
@@ -1,0 +2,9 @@
+Mon Aug 12 11:19:51 UTC 2024 - apla...@suse.com
+
+- Update to version 1+git20240812.ee2298f:
+ * Use arg_no_reuse_initrd as update_initrd
+ * Reorder PIN and PW search
+ * fix portable installation The fallback.efi should not be added when
installing in portable mode
+ * Use /run for tmpfiles instead of /etc
+
+-------------------------------------------------------------------
Old:
----
sdbootutil-1+git20240722.e6d7c91.obscpio
New:
----
sdbootutil-1+git20240812.ee2298f.obscpio
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ sdbootutil.spec ++++++
--- /var/tmp/diff_new_pack.GHnk1e/_old 2024-08-13 13:22:34.332566928 +0200
+++ /var/tmp/diff_new_pack.GHnk1e/_new 2024-08-13 13:22:34.336567094 +0200
@@ -27,7 +27,7 @@
%define git_version %{nil}
%endif
Name: sdbootutil
-Version: 1+git20240722.e6d7c91%{git_version}
+Version: 1+git20240812.ee2298f%{git_version}
Release: 0
Summary: script to install shim with sd-boot
License: MIT
@@ -114,7 +114,6 @@
for i in kernel-install-sdbootutil.conf; do
install -m 755 $i %{buildroot}%{_prefix}/lib/tmpfiles.d/$i
done
-mkdir -p %{buildroot}/etc/kernel/install.d
%transfiletriggerin -- /usr/lib/systemd/boot/efi /usr/share/efi/%_build_arch
cat > /dev/null || :
@@ -147,10 +146,4 @@
%dir %{_prefix}/lib/kernel/install.d
%{_prefix}/lib/kernel/install.d/*
%{_prefix}/lib/tmpfiles.d/kernel-install-sdbootutil.conf
-%dir /etc/kernel
-%dir /etc/kernel/install.d
-%ghost %config(noreplace,missingok) /etc/kernel/install.d/50-depmod.install
-%ghost %config(noreplace,missingok) /etc/kernel/install.d/50-dracut.install
-%ghost %config(noreplace,missingok)
/etc/kernel/install.d/51-dracut-rescue.install
-%ghost %config(noreplace,missingok)
/etc/kernel/install.d/90-loaderentry.install
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.GHnk1e/_old 2024-08-13 13:22:34.380568927 +0200
+++ /var/tmp/diff_new_pack.GHnk1e/_new 2024-08-13 13:22:34.384569095 +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">e6d7c91950fc19513778fdc8fe7ab3a219bc0b54</param></service></servicedata>
+ <param
name="changesrevision">ee2298f897530dd17082b0dae03c6c61c4dcea7d</param></service></servicedata>
(No newline at EOF)
++++++ sdbootutil-1+git20240722.e6d7c91.obscpio ->
sdbootutil-1+git20240812.ee2298f.obscpio ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/sdbootutil-1+git20240722.e6d7c91/kernel-install-sdbootutil.conf
new/sdbootutil-1+git20240812.ee2298f/kernel-install-sdbootutil.conf
--- old/sdbootutil-1+git20240722.e6d7c91/kernel-install-sdbootutil.conf
2024-07-22 11:23:41.000000000 +0200
+++ new/sdbootutil-1+git20240812.ee2298f/kernel-install-sdbootutil.conf
2024-08-12 12:15:24.000000000 +0200
@@ -1,7 +1,6 @@
# disable all kernel-install scripts that are known incompatible
-# with sdbootutil. TODO: should be in in /run:
-# https://github.com/systemd/systemd/pull/30480
-L /etc/kernel/install.d/50-depmod.install - - - - /dev/null
-L /etc/kernel/install.d/50-dracut.install - - - - /dev/null
-L /etc/kernel/install.d/51-dracut-rescue.install - - - - /dev/null
-L /etc/kernel/install.d/90-loaderentry.install - - - - /dev/null
+# with sdbootutil.
+L /run/kernel/install.d/50-depmod.install - - - - /dev/null
+L /run/kernel/install.d/50-dracut.install - - - - /dev/null
+L /run/kernel/install.d/51-dracut-rescue.install - - - - /dev/null
+L /run/kernel/install.d/90-loaderentry.install - - - - /dev/null
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sdbootutil-1+git20240722.e6d7c91/sdbootutil
new/sdbootutil-1+git20240812.ee2298f/sdbootutil
--- old/sdbootutil-1+git20240722.e6d7c91/sdbootutil 2024-07-22
11:23:41.000000000 +0200
+++ new/sdbootutil-1+git20240812.ee2298f/sdbootutil 2024-08-12
12:15:24.000000000 +0200
@@ -47,7 +47,6 @@
# State file for transactional systems
state_file="/var/lib/misc/transactional-update.state"
-update_initrd=
update_predictions=
luks2_devices=()
@@ -1389,9 +1388,8 @@
install -p -D "$bootloader" "$boot_root$boot_dst/grub.efi"
# boot entry point
- for i in MokManager fallback; do
- install -p -D "$prefix$shimdir/$i.efi"
"$boot_root/EFI/BOOT/$i.efi"
- done
+ install -p -D "$prefix$shimdir/MokManager.efi"
"$boot_root/EFI/BOOT/MokManager.efi"
+ [ -n "$arg_portable" ] || install -p -D
"$prefix$shimdir/fallback.efi" "$boot_root/EFI/BOOT/fallback.efi"
install -p -D "$prefix$shimdir/shim.efi"
"$boot_root/EFI/BOOT/BOOT${firmware_arch^^}.EFI"
else
log_info "Installing $bldr_name into $boot_root"
@@ -1942,14 +1940,14 @@
local extra=()
local keyid
keyid="$(keyctl id %user:cryptenroll 2> /dev/null)" || true
- if [ -n "$keyid" ]; then
- pin="$(keyctl pipe "$keyid")"
+ if [ -n "$arg_ask_pin_or_pw" ]; then
+ read -r -s -p "Recovery PIN: " pin
extra=("--recovery-pin=yes")
elif [ -n "$PIN" ]; then
pin="$PIN"
extra=("--recovery-pin=yes")
- elif [ -n "$arg_ask_pin_or_pw" ]; then
- read -r -s -p "Recovery PIN: " pin
+ elif [ -n "$keyid" ]; then
+ pin="$(keyctl pipe "$keyid")"
extra=("--recovery-pin=yes")
fi
@@ -2092,7 +2090,7 @@
if [[ "$opts" != *"$option"* ]]; then
[ -z "$opts" ] && opts="$option" || opts="$opts,$option"
# crypttab has changed so initrd needs to be updated
- update_initrd=1
+ arg_no_reuse_initrd=1
fi
echo "$name $device ${key:-none} $opts" >> "$crypttab"
done < /etc/crypttab
@@ -2121,7 +2119,7 @@
opts="${opts//,$option}"
opts="${opts//$option}"
# crypttab has changed so initrd needs to be updated
- update_initrd=1
+ arg_no_reuse_initrd=1
fi
echo "$name $device ${key:-none} $opts" >> "$crypttab"
done < /etc/crypttab
@@ -2276,8 +2274,7 @@
add_crypttab_option 'fido2-device=auto'
;;
esac
- if [ "$update_initrd" = "1" ]; then
- arg_no_reuse_initrd=1
+ if [ "$arg_no_reuse_initrd" = "1" ]; then
install_all_kernels "$root_snapshot"
# Avoid the call of generate_tpm2_predictions at the
# end of the script
@@ -2318,24 +2315,24 @@
local pin_or_pw keyid
if [ "$arg_method" = "tpm2+pin" ]; then
keyid="$(keyctl id %user:pin 2> /dev/null)" || true
- if [ -n "$keyid" ]; then
- pin_or_pw="$(keyctl pipe "$keyid")"
+ if [ -n "$arg_ask_pin_or_pw" ]; then
+ read -r -s -p "TPM2 PIN: " pin_or_pw
elif [ -n "$PIN" ]; then
pin_or_pw="$PIN"
- elif [ -n "$arg_ask_pin_or_pw" ]; then
- read -r -s -p "TPM2 PIN: " pin_or_pw
+ elif [ -n "$keyid" ]; then
+ pin_or_pw="$(keyctl pipe "$keyid")"
else
err "Use %u:pin, PIN or --ask-pin to provide the TPM2
PIN"
fi
elif [ "$arg_method" = "password" ]; then
local keyid
keyid="$(keyctl id %user:pw 2> /dev/null)" || true
- if [ -n "$keyid" ]; then
- pin_or_pw="$(keyctl pipe "$keyid")"
+ if [ -n "$arg_ask_pin_or_pw" ]; then
+ read -r -s -p "Password: " pin_or_pw
elif [ -n "$PW" ]; then
pin_or_pw="$PW"
- elif [ -n "$arg_ask_pin_or_pw" ]; then
- read -r -s -p "Password: " pin_or_pw
+ elif [ -n "$keyid" ]; then
+ pin_or_pw="$(keyctl pipe "$keyid")"
else
err "Use %u:pw, PW or --ask-pw to provide the password"
fi
@@ -2410,8 +2407,7 @@
remove_crypttab_option 'fido2-device=auto'
;;
esac
- if [ "$update_initrd" = "1" ]; then
- arg_no_reuse_initrd=1
+ if [ "$arg_no_reuse_initrd" = "1" ]; then
install_all_kernels "$root_snapshot"
# Avoid the call of generate_tpm2_predictions at the
# end of the script
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/sdbootutil-1+git20240722.e6d7c91/sdbootutil.spec
new/sdbootutil-1+git20240812.ee2298f/sdbootutil.spec
--- old/sdbootutil-1+git20240722.e6d7c91/sdbootutil.spec 2024-07-22
11:23:41.000000000 +0200
+++ new/sdbootutil-1+git20240812.ee2298f/sdbootutil.spec 2024-08-12
12:15:24.000000000 +0200
@@ -114,7 +114,6 @@
for i in kernel-install-sdbootutil.conf; do
install -m 755 $i %{buildroot}%{_prefix}/lib/tmpfiles.d/$i
done
-mkdir -p %{buildroot}/etc/kernel/install.d
%transfiletriggerin -- /usr/lib/systemd/boot/efi /usr/share/efi/%_build_arch
cat > /dev/null || :
@@ -147,11 +146,5 @@
%dir %{_prefix}/lib/kernel/install.d
%{_prefix}/lib/kernel/install.d/*
%{_prefix}/lib/tmpfiles.d/kernel-install-sdbootutil.conf
-%dir /etc/kernel
-%dir /etc/kernel/install.d
-%ghost %config(noreplace,missingok) /etc/kernel/install.d/50-depmod.install
-%ghost %config(noreplace,missingok) /etc/kernel/install.d/50-dracut.install
-%ghost %config(noreplace,missingok)
/etc/kernel/install.d/51-dracut-rescue.install
-%ghost %config(noreplace,missingok)
/etc/kernel/install.d/90-loaderentry.install
%changelog
++++++ sdbootutil.obsinfo ++++++
--- /var/tmp/diff_new_pack.GHnk1e/_old 2024-08-13 13:22:34.512574428 +0200
+++ /var/tmp/diff_new_pack.GHnk1e/_new 2024-08-13 13:22:34.516574594 +0200
@@ -1,5 +1,5 @@
name: sdbootutil
-version: 1+git20240722.e6d7c91
-mtime: 1721640221
-commit: e6d7c91950fc19513778fdc8fe7ab3a219bc0b54
+version: 1+git20240812.ee2298f
+mtime: 1723457724
+commit: ee2298f897530dd17082b0dae03c6c61c4dcea7d
