commit dracut-pcr-signature for openSUSE:Factory
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-06-04 12:50:44
Comparing /work/SRC/openSUSE:Factory/dracut-pcr-signature (Old)
and /work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.24587 (New)
Package is "dracut-pcr-signature"
Tue Jun 4 12:50:44 2024 rev:9 rq:1177875 version:0.4+0
Changes:
---
/work/SRC/openSUSE:Factory/dracut-pcr-signature/dracut-pcr-signature.changes
2024-04-24 15:13:35.763488613 +0200
+++
/work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.24587/dracut-pcr-signature.changes
2024-06-04 12:51:10.523922978 +0200
@@ -1,0 +2,12 @@
+Thu May 30 08:45:40 UTC 2024 - Alberto Planas Dominguez
+
+- Update to version 0.4:
+ + No new features, tagged on 0.3+6
+- Remove GRUB2 conflict
+
+---
+Mon May 13 20:42:01 UTC 2024 - Alberto Planas Dominguez
+
+- Adapt regenerate initrd macro expansion
+
+---
Old:
dracut-pcr-signature-0.3+6.tar.xz
New:
dracut-pcr-signature-0.4+0.tar.xz
Other differences:
--
++ dracut-pcr-signature.spec ++
--- /var/tmp/diff_new_pack.Z0D7mx/_old 2024-06-04 12:51:11.067942718 +0200
+++ /var/tmp/diff_new_pack.Z0D7mx/_new 2024-06-04 12:51:11.071942864 +0200
@@ -17,7 +17,7 @@
Name: dracut-pcr-signature
-Version:0.3+6
+Version:0.4+0
Release:0
Summary:Dracut module to import PCR signatures
License:GPL-2.0-or-later
@@ -26,7 +26,6 @@
BuildRequires: rpm-config-SUSE
BuildRequires: pkgconfig(dracut)
BuildArch: noarch
-Conflicts: grub2
%description
Dracut module to import PCR signatures. This will make possible the
@@ -46,13 +45,13 @@
cp pcr-signature.conf %buildroot/usr/lib/dracut/modules.d/50pcr-signature
%post
-%regenerate_initrd_post
+%{?regenerate_initrd_post}
%posttrans
-%regenerate_initrd_posttrans
+%{?regenerate_initrd_posttrans}
%postun
-%regenerate_initrd_post
+%{?regenerate_initrd_post}
%files
%license LICENSE
++ dracut-pcr-signature-0.3+6.tar.xz -> dracut-pcr-signature-0.4+0.tar.xz
++
commit dracut-pcr-signature for openSUSE:Factory
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-24 15:13:17
Comparing /work/SRC/openSUSE:Factory/dracut-pcr-signature (Old)
and /work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.1880 (New)
Package is "dracut-pcr-signature"
Wed Apr 24 15:13:17 2024 rev:8 rq:1169628 version:0.3+6
Changes:
---
/work/SRC/openSUSE:Factory/dracut-pcr-signature/dracut-pcr-signature.changes
2024-04-18 22:11:35.471243423 +0200
+++
/work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.1880/dracut-pcr-signature.changes
2024-04-24 15:13:35.763488613 +0200
@@ -1,0 +2,6 @@
+Mon Apr 22 09:08:46 UTC 2024 - apla...@suse.com
+
+- Update to version 0.3+6:
+ * Add UTF8 character set
+
+---
Old:
dracut-pcr-signature-0.3+5.tar.xz
New:
dracut-pcr-signature-0.3+6.tar.xz
Other differences:
--
++ dracut-pcr-signature.spec ++
--- /var/tmp/diff_new_pack.3Kltrf/_old 2024-04-24 15:13:36.299508108 +0200
+++ /var/tmp/diff_new_pack.3Kltrf/_new 2024-04-24 15:13:36.299508108 +0200
@@ -17,7 +17,7 @@
Name: dracut-pcr-signature
-Version:0.3+5
+Version:0.3+6
Release:0
Summary:Dracut module to import PCR signatures
License:GPL-2.0-or-later
++ _servicedata ++
--- /var/tmp/diff_new_pack.3Kltrf/_old 2024-04-24 15:13:36.35150 +0200
+++ /var/tmp/diff_new_pack.3Kltrf/_new 2024-04-24 15:13:36.355510145 +0200
@@ -1,6 +1,6 @@
https://github.com/aplanas/dracut-pcr-signature.git
- da6c1262027a0814dcefb179f68aee7b2586c261
+ 9f5e5bc9f0e8d9cd4c6dfcca8f5505acce98d3dd
(No newline at EOF)
++ dracut-pcr-signature-0.3+5.tar.xz -> dracut-pcr-signature-0.3+6.tar.xz
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.3+5/module-setup.sh
new/dracut-pcr-signature-0.3+6/module-setup.sh
--- old/dracut-pcr-signature-0.3+5/module-setup.sh 2024-04-17
14:04:23.0 +0200
+++ new/dracut-pcr-signature-0.3+6/module-setup.sh 2024-04-22
11:06:51.0 +0200
@@ -13,7 +13,7 @@
installkernel() {
inst_multiple mountpoint rmdir dd tr mktemp
# Filesystem (vfat) and codepages required to mount the ESP
-hostonly="" instmods vfat nls_cp437 nls_iso8859-1
+hostonly="" instmods vfat nls_cp437 nls_iso8859-1 nls_utf8
}
install() {
commit dracut-pcr-signature for openSUSE:Factory
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 @@
https://github.com/aplanas/dracut-pcr-signature.git
- f12ad63e3322c8b82f9c27f1dd21f9a84c458cec
+ da6c1262027a0814dcefb179f68aee7b2586c261
(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.spec2024-04-12
20:01:05.0 +0200
+++ new/dracut-pcr-signature-0.3+5/dracut-pcr-signature.spec2024-04-17
14:04:23.0 +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.0 +0200
+++ new/dracut-pcr-signature-0.3+5/pcr-signature.sh 2024-04-17
14:04:23.0 +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
commit dracut-pcr-signature for openSUSE:Factory
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-15 20:14:08
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"
Mon Apr 15 20:14:08 2024 rev:6 rq:1167478 version:0.3+1
Changes:
---
/work/SRC/openSUSE:Factory/dracut-pcr-signature/dracut-pcr-signature.changes
2024-04-10 17:48:50.977071456 +0200
+++
/work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.26366/dracut-pcr-signature.changes
2024-04-15 20:19:28.146812065 +0200
@@ -1,0 +2,6 @@
+Fri Apr 12 18:01:58 UTC 2024 - apla...@suse.com
+
+- Update to version 0.3+1:
+ * Include mktemp in initrd
+
+---
Old:
dracut-pcr-signature-0.3+0.tar.xz
New:
dracut-pcr-signature-0.3+1.tar.xz
Other differences:
--
++ dracut-pcr-signature.spec ++
--- /var/tmp/diff_new_pack.9pACjT/_old 2024-04-15 20:19:28.630830030 +0200
+++ /var/tmp/diff_new_pack.9pACjT/_new 2024-04-15 20:19:28.630830030 +0200
@@ -17,7 +17,7 @@
Name: dracut-pcr-signature
-Version:0.3+0
+Version:0.3+1
Release:0
Summary:Dracut module to import PCR signatures
License:GPL-2.0-or-later
++ _servicedata ++
--- /var/tmp/diff_new_pack.9pACjT/_old 2024-04-15 20:19:28.662831217 +0200
+++ /var/tmp/diff_new_pack.9pACjT/_new 2024-04-15 20:19:28.666831366 +0200
@@ -1,6 +1,6 @@
https://github.com/aplanas/dracut-pcr-signature.git
- 37e8da3db49f22c517b14a877ce0169ba8979927
+ f12ad63e3322c8b82f9c27f1dd21f9a84c458cec
(No newline at EOF)
++ dracut-pcr-signature-0.3+0.tar.xz -> dracut-pcr-signature-0.3+1.tar.xz
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.3+0/module-setup.sh
new/dracut-pcr-signature-0.3+1/module-setup.sh
--- old/dracut-pcr-signature-0.3+0/module-setup.sh 2024-04-10
11:18:36.0 +0200
+++ new/dracut-pcr-signature-0.3+1/module-setup.sh 2024-04-12
20:01:05.0 +0200
@@ -11,7 +11,7 @@
}
installkernel() {
-inst_multiple mountpoint rmdir dd tr
+inst_multiple mountpoint rmdir dd tr mktemp
# Filesystem (vfat) and codepages required to mount the ESP
hostonly="" instmods vfat nls_cp437 nls_iso8859-1
}
commit dracut-pcr-signature for openSUSE:Factory
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-10 17:48:44
Comparing /work/SRC/openSUSE:Factory/dracut-pcr-signature (Old)
and /work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.29460 (New)
Package is "dracut-pcr-signature"
Wed Apr 10 17:48:44 2024 rev:5 rq:1166632 version:0.3+0
Changes:
---
/work/SRC/openSUSE:Factory/dracut-pcr-signature/dracut-pcr-signature.changes
2024-03-13 22:17:50.818656944 +0100
+++
/work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.29460/dracut-pcr-signature.changes
2024-04-10 17:48:50.977071456 +0200
@@ -1,0 +2,6 @@
+Wed Apr 10 11:13:22 UTC 2024 - apla...@suse.com
+
+- Update to version 0.3+0:
+ * Various small improvements
+
+---
Old:
dracut-pcr-signature-0.2+0.tar.xz
New:
dracut-pcr-signature-0.3+0.tar.xz
Other differences:
--
++ dracut-pcr-signature.spec ++
--- /var/tmp/diff_new_pack.U4hrVx/_old 2024-04-10 17:48:52.113113264 +0200
+++ /var/tmp/diff_new_pack.U4hrVx/_new 2024-04-10 17:48:52.113113264 +0200
@@ -17,7 +17,7 @@
Name: dracut-pcr-signature
-Version:0.2+0
+Version:0.3+0
Release:0
Summary:Dracut module to import PCR signatures
License:GPL-2.0-or-later
++ _servicedata ++
--- /var/tmp/diff_new_pack.U4hrVx/_old 2024-04-10 17:48:52.149114588 +0200
+++ /var/tmp/diff_new_pack.U4hrVx/_new 2024-04-10 17:48:52.153114736 +0200
@@ -1,6 +1,6 @@
https://github.com/aplanas/dracut-pcr-signature.git
- b6b4f3e73cfb572448fa0b28b962af4fcc817e5f
+ 37e8da3db49f22c517b14a877ce0169ba8979927
(No newline at EOF)
++ dracut-pcr-signature-0.2+0.tar.xz -> dracut-pcr-signature-0.3+0.tar.xz
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.2+0/module-setup.sh
new/dracut-pcr-signature-0.3+0/module-setup.sh
--- old/dracut-pcr-signature-0.2+0/module-setup.sh 2024-03-12
16:06:09.0 +0100
+++ new/dracut-pcr-signature-0.3+0/module-setup.sh 2024-04-10
11:18:36.0 +0200
@@ -11,7 +11,7 @@
}
installkernel() {
-inst_multiple grep rmdir
+inst_multiple mountpoint rmdir dd tr
# Filesystem (vfat) and codepages required to mount the ESP
hostonly="" instmods vfat nls_cp437 nls_iso8859-1
}
@@ -22,8 +22,8 @@
# easy execute the service when the ESP device is ready and the
# systemd-cryptsetup service was still not executed
# (cryptsetup.target). One solution is to use a generator, that
-# will after/requires from dev-disk-bytpartuuid-XXX, where XXX
+# will after/requires from dev-disk-by-partuuid-XXX, where XXX
# comes from LoaderDevicePartUUID efivar. The other option is an
-# override (this one)
+# override (this one).
inst_simple "${moddir}/pcr-signature.conf"
"/etc/systemd/system/systemd-cryptsetup@.service.d/pcr-signature.conf"
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.2+0/pcr-signature.sh
new/dracut-pcr-signature-0.3+0/pcr-signature.sh
--- old/dracut-pcr-signature-0.2+0/pcr-signature.sh 2024-03-12
16:06:09.0 +0100
+++ new/dracut-pcr-signature-0.3+0/pcr-signature.sh 2024-04-10
11:18:36.0 +0200
@@ -1,64 +1,42 @@
#!/bin/bash
+set -euo pipefail
-MNT="/tmp/pcr-signature"
-# Maybe a better place is loader/credentials
-SYSTEMD="EFI/systemd"
-OPENSUSE="EFI/opensuse"
-SIGNATURES=""
-VENDOR="4a67b082-0a4c-41cf-b6c7-440b29bb8c4f"
# If GRUB2 is used, bli.mod needs to be loaded
-EFIVAR="/sys/firmware/efi/efivars/LoaderDevicePartUUID-$VENDOR"
+EFIVAR="/sys/firmware/efi/efivars/LoaderDevicePartUUID-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f"
-cleanup()
-{
-is_mount "$MNT" && umount "$MNT"
-rmdir "$MNT"
-}
-trap cleanup EXIT
+[ -e "$EFIVAR" ] || exit 0
-is_mount() {
-grep -q "$1" /proc/mounts
-}
+if [ -e "/var/lib/systemd/pcrlock.json" ] || [ -e
"/etc/systemd/tpm2-pcr-signature.json" ]; then
+ # Already ran?
+ exit 0
+fi
-mount_esp() {
-[ -e "$EFIVAR" ] || return 0
-mount "$DEV" "$MNT"
-if [ -e "${MNT}/${SYSTEMD}" ]; then
- SIGNATURES="$SYSTEMD"
- return 0
-elif [ -e "${MNT}/${OPENSUSE}" ]; then
- SIGNATURES="$OPENSUSE"
- return 0
-fi
-umount "$MNT"
-}
+# 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
commit dracut-pcr-signature for openSUSE:Factory
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-03-13 22:17:01
Comparing /work/SRC/openSUSE:Factory/dracut-pcr-signature (Old)
and /work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.1770 (New)
Package is "dracut-pcr-signature"
Wed Mar 13 22:17:01 2024 rev:4 rq:1157289 version:0.2+0
Changes:
---
/work/SRC/openSUSE:Factory/dracut-pcr-signature/dracut-pcr-signature.changes
2024-02-02 15:45:14.116269465 +0100
+++
/work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.1770/dracut-pcr-signature.changes
2024-03-13 22:17:50.818656944 +0100
@@ -1,0 +2,6 @@
+Tue Mar 12 15:08:08 UTC 2024 - apla...@suse.com
+
+- Update to version 0.2:
+ * Support GRUB2 configurations
+
+---
Old:
dracut-pcr-signature-0.1+3.tar.xz
New:
dracut-pcr-signature-0.2+0.tar.xz
Other differences:
--
++ dracut-pcr-signature.spec ++
--- /var/tmp/diff_new_pack.6BrCo9/_old 2024-03-13 22:17:51.758691527 +0100
+++ /var/tmp/diff_new_pack.6BrCo9/_new 2024-03-13 22:17:51.758691527 +0100
@@ -17,7 +17,7 @@
Name: dracut-pcr-signature
-Version:0.1+3
+Version:0.2+0
Release:0
Summary:Dracut module to import PCR signatures
License:GPL-2.0-or-later
++ _servicedata ++
--- /var/tmp/diff_new_pack.6BrCo9/_old 2024-03-13 22:17:51.802693145 +0100
+++ /var/tmp/diff_new_pack.6BrCo9/_new 2024-03-13 22:17:51.802693145 +0100
@@ -1,6 +1,6 @@
https://github.com/aplanas/dracut-pcr-signature.git
- 1046cfb93b0fb4b17ba5cd67c30288ac5045b196
+ b6b4f3e73cfb572448fa0b28b962af4fcc817e5f
(No newline at EOF)
++ dracut-pcr-signature-0.1+3.tar.xz -> dracut-pcr-signature-0.2+0.tar.xz
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.1+3/pcr-signature.sh
new/dracut-pcr-signature-0.2+0/pcr-signature.sh
--- old/dracut-pcr-signature-0.1+3/pcr-signature.sh 2024-01-30
10:13:39.0 +0100
+++ new/dracut-pcr-signature-0.2+0/pcr-signature.sh 2024-03-12
16:06:09.0 +0100
@@ -3,7 +3,10 @@
MNT="/tmp/pcr-signature"
# Maybe a better place is loader/credentials
SYSTEMD="EFI/systemd"
+OPENSUSE="EFI/opensuse"
+SIGNATURES=""
VENDOR="4a67b082-0a4c-41cf-b6c7-440b29bb8c4f"
+# If GRUB2 is used, bli.mod needs to be loaded
EFIVAR="/sys/firmware/efi/efivars/LoaderDevicePartUUID-$VENDOR"
cleanup()
@@ -20,7 +23,13 @@
mount_esp() {
[ -e "$EFIVAR" ] || return 0
mount "$DEV" "$MNT"
-[ -e "${MNT}/${SYSTEMD}" ] && return 0
+if [ -e "${MNT}/${SYSTEMD}" ]; then
+ SIGNATURES="$SYSTEMD"
+ return 0
+elif [ -e "${MNT}/${OPENSUSE}" ]; then
+ SIGNATURES="$OPENSUSE"
+ return 0
+fi
umount "$MNT"
}
@@ -42,13 +51,13 @@
mount_esp
if is_mount "$MNT"; then
-if [ -e "${MNT}/${SYSTEMD}/pcrlock.json" ]; then
+if [ -e "${MNT}/${SIGNATURES}/pcrlock.json" ]; then
mkdir -p /var/lib/systemd
- cp "${MNT}/${SYSTEMD}/pcrlock.json" /var/lib/systemd
-elif [ -e "${MNT}/${SYSTEMD}/tpm2-pcr-signature.json" ] && [ -e
"${MNT}/${SYSTEMD}/tpm2-pcr-public-key.pem" ]; then
+ cp "${MNT}/${SIGNATURES}/pcrlock.json" /var/lib/systemd
+elif [ -e "${MNT}/${SIGNATURES}/tpm2-pcr-signature.json" ] && [ -e
"${MNT}/${SIGNATURES}/tpm2-pcr-public-key.pem" ]; then
mkdir -p /etc/systemd
- cp "${MNT}/${SYSTEMD}/tpm2-pcr-signature.json" /etc/systemd
- cp "${MNT}/${SYSTEMD}/tpm2-pcr-public-key.pem" /etc/systemd
+ cp "${MNT}/${SIGNATURES}/tpm2-pcr-signature.json" /etc/systemd
+ cp "${MNT}/${SIGNATURES}/tpm2-pcr-public-key.pem" /etc/systemd
fi
fi
commit dracut-pcr-signature for openSUSE:Factory
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-02-02 15:44:55
Comparing /work/SRC/openSUSE:Factory/dracut-pcr-signature (Old)
and /work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.1815 (New)
Package is "dracut-pcr-signature"
Fri Feb 2 15:44:55 2024 rev:3 rq:1143473 version:0.1+3
Changes:
---
/work/SRC/openSUSE:Factory/dracut-pcr-signature/dracut-pcr-signature.changes
2024-01-10 21:50:55.061180047 +0100
+++
/work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.1815/dracut-pcr-signature.changes
2024-02-02 15:45:14.116269465 +0100
@@ -1,0 +2,6 @@
+Tue Jan 30 09:16:29 UTC 2024 - apla...@suse.com
+
+- Update to version 0.1+3:
+ * Copy pcrlock.json if available
+
+---
Old:
dracut-pcr-signature-0.1+2.tar.xz
New:
dracut-pcr-signature-0.1+3.tar.xz
Other differences:
--
++ dracut-pcr-signature.spec ++
--- /var/tmp/diff_new_pack.gejDP0/_old 2024-02-02 15:45:14.676289750 +0100
+++ /var/tmp/diff_new_pack.gejDP0/_new 2024-02-02 15:45:14.676289750 +0100
@@ -17,7 +17,7 @@
Name: dracut-pcr-signature
-Version:0.1+2
+Version:0.1+3
Release:0
Summary:Dracut module to import PCR signatures
License:GPL-2.0-or-later
++ _servicedata ++
--- /var/tmp/diff_new_pack.gejDP0/_old 2024-02-02 15:45:14.708290909 +0100
+++ /var/tmp/diff_new_pack.gejDP0/_new 2024-02-02 15:45:14.712291054 +0100
@@ -1,6 +1,6 @@
https://github.com/aplanas/dracut-pcr-signature.git
- c4177c5346b8143d14d7bb568ad4a2c997b2eef4
+ 1046cfb93b0fb4b17ba5cd67c30288ac5045b196
(No newline at EOF)
++ dracut-pcr-signature-0.1+2.tar.xz -> dracut-pcr-signature-0.1+3.tar.xz
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.1+2/pcr-signature.sh
new/dracut-pcr-signature-0.1+3/pcr-signature.sh
--- old/dracut-pcr-signature-0.1+2/pcr-signature.sh 2024-01-09
08:33:42.0 +0100
+++ new/dracut-pcr-signature-0.1+3/pcr-signature.sh 2024-01-30
10:13:39.0 +0100
@@ -1,6 +1,7 @@
#!/bin/bash
MNT="/tmp/pcr-signature"
+# Maybe a better place is loader/credentials
SYSTEMD="EFI/systemd"
VENDOR="4a67b082-0a4c-41cf-b6c7-440b29bb8c4f"
EFIVAR="/sys/firmware/efi/efivars/LoaderDevicePartUUID-$VENDOR"
@@ -40,10 +41,15 @@
mount_esp
-if is_mount "$MNT" && [ -e "${MNT}/${SYSTEMD}/tpm2-pcr-signature.json" ] && [
-e "${MNT}/${SYSTEMD}/tpm2-pcr-public-key.pem" ]; then
-mkdir -p /etc/systemd
-cp "${MNT}/${SYSTEMD}/tpm2-pcr-signature.json" /etc/systemd
-cp "${MNT}/${SYSTEMD}/tpm2-pcr-public-key.pem" /etc/systemd
+if is_mount "$MNT"; then
+if [ -e "${MNT}/${SYSTEMD}/pcrlock.json" ]; then
+ mkdir -p /var/lib/systemd
+ cp "${MNT}/${SYSTEMD}/pcrlock.json" /var/lib/systemd
+elif [ -e "${MNT}/${SYSTEMD}/tpm2-pcr-signature.json" ] && [ -e
"${MNT}/${SYSTEMD}/tpm2-pcr-public-key.pem" ]; then
+ mkdir -p /etc/systemd
+ cp "${MNT}/${SYSTEMD}/tpm2-pcr-signature.json" /etc/systemd
+ cp "${MNT}/${SYSTEMD}/tpm2-pcr-public-key.pem" /etc/systemd
+fi
fi
is_mount "$MNT" && umount "$MNT"
commit dracut-pcr-signature for openSUSE:Factory
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-01-10 21:50:47
Comparing /work/SRC/openSUSE:Factory/dracut-pcr-signature (Old)
and /work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.21961 (New)
Package is "dracut-pcr-signature"
Wed Jan 10 21:50:47 2024 rev:2 rq:1137671 version:0.1+2
Changes:
---
/work/SRC/openSUSE:Factory/dracut-pcr-signature/dracut-pcr-signature.changes
2023-12-09 22:57:39.745324973 +0100
+++
/work/SRC/openSUSE:Factory/.dracut-pcr-signature.new.21961/dracut-pcr-signature.changes
2024-01-10 21:50:55.061180047 +0100
@@ -1,0 +2,6 @@
+Tue Jan 09 07:35:24 UTC 2024 - apla...@suse.com
+
+- Update to version 0.1+2:
+ * Explicitly add VFAT module
+
+---
Old:
dracut-pcr-signature-0.1+1.tar.xz
New:
dracut-pcr-signature-0.1+2.tar.xz
Other differences:
--
++ dracut-pcr-signature.spec ++
--- /var/tmp/diff_new_pack.SvsWcX/_old 2024-01-10 21:50:55.697203143 +0100
+++ /var/tmp/diff_new_pack.SvsWcX/_new 2024-01-10 21:50:55.697203143 +0100
@@ -1,7 +1,7 @@
#
# spec file for package dracut-pcr-signature
#
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: dracut-pcr-signature
-Version:0.1+1
+Version:0.1+2
Release:0
Summary:Dracut module to import PCR signatures
License:GPL-2.0-or-later
++ _servicedata ++
--- /var/tmp/diff_new_pack.SvsWcX/_old 2024-01-10 21:50:55.733204451 +0100
+++ /var/tmp/diff_new_pack.SvsWcX/_new 2024-01-10 21:50:55.737204596 +0100
@@ -1,6 +1,6 @@
https://github.com/aplanas/dracut-pcr-signature.git
- bf9761a7efc5c7965f1249fe11ca3ad9c44bf774
+ c4177c5346b8143d14d7bb568ad4a2c997b2eef4
(No newline at EOF)
++ dracut-pcr-signature-0.1+1.tar.xz -> dracut-pcr-signature-0.1+2.tar.xz
++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/dracut-pcr-signature-0.1+1/module-setup.sh
new/dracut-pcr-signature-0.1+2/module-setup.sh
--- old/dracut-pcr-signature-0.1+1/module-setup.sh 2023-12-01
14:03:36.0 +0100
+++ new/dracut-pcr-signature-0.1+2/module-setup.sh 2024-01-09
08:33:42.0 +0100
@@ -12,8 +12,8 @@
installkernel() {
inst_multiple grep rmdir
-# Codepages required to mount the ESP (vfat)
-hostonly="" instmods nls_cp437 nls_iso8859-1
+# Filesystem (vfat) and codepages required to mount the ESP
+hostonly="" instmods vfat nls_cp437 nls_iso8859-1
}
install() {
