Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package dracut-pcr-signature for
openSUSE:Factory checked in at 2024-04-18 22:10:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/dracut-pcr-signature (Old)
and /work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.26366 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "dracut-pcr-signature"
Thu Apr 18 22:10:54 2024 rev:7 rq:1168535 version:0.3+5
Changes:
--------
---
/work/SRC/openSUSE:Factory/dracut-pcr-signature/dracut-pcr-signature.changes
2024-04-15 20:19:28.146812065 +0200
+++
/work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.26366/dracut-pcr-signature.changes
2024-04-18 22:11:35.471243423 +0200
@@ -1,0 +2,14 @@
+Wed Apr 17 12:29:01 UTC 2024 - apla...@suse.com
+
+- Update to version 0.3+5:
+ * Generate the initrd after installation
+ * Temporaly conflict with GRUB2
+ * Small fix for comment
+
+-------------------------------------------------------------------
+Tue Apr 16 17:19:57 UTC 2024 - apla...@suse.com
+
+- Update to version 0.3+2:
+ * Do not hard fail when error in mount
+
+-------------------------------------------------------------------
Old:
----
dracut-pcr-signature-0.3+1.tar.xz
New:
----
dracut-pcr-signature-0.3+5.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ dracut-pcr-signature.spec ++++++
--- /var/tmp/diff_new_pack.P5fwL0/_old 2024-04-18 22:11:36.027263857 +0200
+++ /var/tmp/diff_new_pack.P5fwL0/_new 2024-04-18 22:11:36.027263857 +0200
@@ -17,14 +17,16 @@
Name: dracut-pcr-signature
-Version: 0.3+1
+Version: 0.3+5
Release: 0
Summary: Dracut module to import PCR signatures
License: GPL-2.0-or-later
URL: https://github.com/aplanas/dracut-pcr-signature
Source: %{name}-%{version}.tar.xz
-Requires: dracut
+BuildRequires: rpm-config-SUSE
+BuildRequires: pkgconfig(dracut)
BuildArch: noarch
+Conflicts: grub2
%description
Dracut module to import PCR signatures. This will make possible the
@@ -43,6 +45,15 @@
cp pcr-signature.sh %buildroot/usr/lib/dracut/modules.d/50pcr-signature
cp pcr-signature.conf %buildroot/usr/lib/dracut/modules.d/50pcr-signature
+%post
+%regenerate_initrd_post
+
+%posttrans
+%regenerate_initrd_posttrans
+
+%postun
+%regenerate_initrd_post
+
%files
%license LICENSE
%doc README.md
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.P5fwL0/_old 2024-04-18 22:11:36.059265033 +0200
+++ /var/tmp/diff_new_pack.P5fwL0/_new 2024-04-18 22:11:36.063265179 +0200
@@ -1,6 +1,6 @@
<servicedata>
<service name="tar_scm">
<param
name="url">https://github.com/aplanas/dracut-pcr-signature.git</param>
- <param
name="changesrevision">f12ad63e3322c8b82f9c27f1dd21f9a84c458cec</param></service></servicedata>
+ <param
name="changesrevision">da6c1262027a0814dcefb179f68aee7b2586c261</param></service></servicedata>
(No newline at EOF)
++++++ dracut-pcr-signature-0.3+1.tar.xz -> dracut-pcr-signature-0.3+5.tar.xz
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.3+1/dracut-pcr-signature.spec
new/dracut-pcr-signature-0.3+5/dracut-pcr-signature.spec
--- old/dracut-pcr-signature-0.3+1/dracut-pcr-signature.spec 2024-04-12
20:01:05.000000000 +0200
+++ new/dracut-pcr-signature-0.3+5/dracut-pcr-signature.spec 2024-04-17
14:04:23.000000000 +0200
@@ -23,8 +23,10 @@
License: GPL-2.0-or-later
URL: https://github.com/aplanas/dracut-pcr-signature
Source: %{name}-%{version}.tar.xz
-Requires: dracut
+BuildRequires: pkgconfig(dracut)
+BuildRequires: rpm-config-SUSE
BuildArch: noarch
+Conflicts: grub2
%description
Dracut module to import PCR signatures. This will make possible the
@@ -43,6 +45,15 @@
cp pcr-signature.sh %buildroot/usr/lib/dracut/modules.d/50pcr-signature
cp pcr-signature.conf %buildroot/usr/lib/dracut/modules.d/50pcr-signature
+%post
+%regenerate_initrd_post
+
+%posttrans
+%regenerate_initrd_posttrans
+
+%postun
+%regenerate_initrd_post
+
%files
%license LICENSE
%doc README.md
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.3+1/pcr-signature.sh
new/dracut-pcr-signature-0.3+5/pcr-signature.sh
--- old/dracut-pcr-signature-0.3+1/pcr-signature.sh 2024-04-12
20:01:05.000000000 +0200
+++ new/dracut-pcr-signature-0.3+5/pcr-signature.sh 2024-04-17
14:04:23.000000000 +0200
@@ -7,36 +7,42 @@
[ -e "$EFIVAR" ] || exit 0
if [ -e "/var/lib/systemd/pcrlock.json" ] || [ -e
"/etc/systemd/tpm2-pcr-signature.json" ]; then
- # Already ran?
- exit 0
+ echo "pcr-signature: signature file already present"
+ exit 0
fi
-# Read the value of the EFI variable, that contains a header and
-# ends with '\0' and make it lowercase
+# Read the value of the EFI variable, that contains a header and ends
+# with '\0' and make it lowercase
ESP_UUID="$(dd "if=$EFIVAR" bs=2 skip=2 conv=lcase status=none | tr -d '\0')"
DEV="/dev/disk/by-partuuid/${ESP_UUID}"
MNT="$(mktemp -d)"
cleanup()
{
- if mountpoint -q "$MNT"; then
- umount "$MNT"
- fi
- rmdir "$MNT"
+ if mountpoint -q "$MNT"; then
+ umount "$MNT" || {
+ echo "pcr-signature: unable to umount ESP"
+ exit 0
+ }
+ fi
+ rmdir "$MNT"
}
trap cleanup EXIT
-mount -o ro "$DEV" "$MNT"
+mount -o ro "$DEV" "$MNT" || {
+ echo "pcr-signature: unable to mount ESP"
+ exit 0
+}
for location in "${MNT}/EFI/systemd" "${MNT}/EFI/opensuse"; do
- if [ -e "${location}/pcrlock.json" ]; then
- mkdir -p /var/lib/systemd
- cp "${location}/pcrlock.json" /var/lib/systemd
- break
- elif [ -e "${location}/tpm2-pcr-signature.json" ] && [ -e
"${location}/tpm2-pcr-public-key.pem" ]; then
- mkdir -p /etc/systemd
- cp "${location}/tpm2-pcr-signature.json" /etc/systemd
- cp "${location}/tpm2-pcr-public-key.pem" /etc/systemd
- break
- fi
+ if [ -e "${location}/pcrlock.json" ]; then
+ mkdir -p /var/lib/systemd
+ cp "${location}/pcrlock.json" /var/lib/systemd
+ break
+ elif [ -e "${location}/tpm2-pcr-signature.json" ] && [ -e
"${location}/tpm2-pcr-public-key.pem" ]; then
+ mkdir -p /etc/systemd
+ cp "${location}/tpm2-pcr-signature.json" /etc/systemd
+ cp "${location}/tpm2-pcr-public-key.pem" /etc/systemd
+ break
+ fi
done
