Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2022-11-23 09:47:35
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Wed Nov 23 09:47:35 2022 rev:275 rq:1037229 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2022-11-16
15:42:44.979698229 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.1597/grub2.changes 2022-11-23
09:47:43.210920548 +0100
@@ -1,0 +2,7 @@
+Mon Nov 21 02:10:28 UTC 2022 - Michael Chang <mch...@suse.com>
+
+- Fix regression of reverting back to asking password twice when a keyfile is
+ already used (bsc#1205309)
+ * 0010-templates-import-etc-crypttab-to-grub.cfg.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ 0010-templates-import-etc-crypttab-to-grub.cfg.patch ++++++
--- /var/tmp/diff_new_pack.0EMga3/_old 2022-11-23 09:47:46.486937641 +0100
+++ /var/tmp/diff_new_pack.0EMga3/_new 2022-11-23 09:47:46.486937641 +0100
@@ -11,35 +11,30 @@
Signed-off-by: Michael Chang <mch...@suse.com>
---
- Makefile.util.def | 7 +++++++
- util/grub.d/05_crypttab.in | 36 ++++++++++++++++++++++++++++++++++++
- 2 files changed, 43 insertions(+)
+ Makefile.util.def | 7 ++++++
+ util/grub.d/05_crypttab.in | 50
+++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 57 insertions(+)
create mode 100644 util/grub.d/05_crypttab.in
-diff --git a/Makefile.util.def b/Makefile.util.def
-index 08f681cd8b..5e0ba22f3d 100644
--- a/Makefile.util.def
+++ b/Makefile.util.def
-@@ -476,6 +476,13 @@ script = {
- installdir = grubconf;
+@@ -477,6 +477,13 @@
};
-+script = {
+ script = {
+ name = '05_crypttab';
+ common = util/grub.d/05_crypttab.in;
+ installdir = grubconf;
+ condition = COND_HOST_LINUX;
+};
+
- script = {
++script = {
name = '10_windows';
common = util/grub.d/10_windows.in;
-diff --git a/util/grub.d/05_crypttab.in b/util/grub.d/05_crypttab.in
-new file mode 100644
-index 0000000000..c539bc061e
+ installdir = grubconf;
--- /dev/null
+++ b/util/grub.d/05_crypttab.in
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,50 @@
+#! /bin/sh
+set -e
+
@@ -71,12 +66,23 @@
+CRYPTTAB=/etc/crypttab
+
+if [ -r "$CRYPTTAB" ]; then
-+ awk '/UUID=/ { sub(/UUID=/,"",$2); \
-+ gsub(/-/,"",$2); \
-+ printf("crypttab_entry %s %s %s\n",$1,$2,$3) \
-+ }' "$CRYPTTAB"
++ awk '
++ $3 ~ /(^\/dev\/|^\/proc\/|^\/sys\/|:)/ { next }
++ { key[0] = $3 }
++ $3 ~ /(^$|none|-)/ {
++ key[0] = "/etc/cryptsetup-keys.d/" $1 ".key"
++ key[1] = "/run/cryptsetup-keys.d/" $1 ".key"
++ }
++ {
++ for (d in key)
++ if (system("test -f " key[d]) == 0)
++ next
++ }
++ /UUID=/ {
++ sub(/UUID=/,"",$2);
++ gsub(/-/,"",$2);
++ printf("crypttab_entry %s %s %s\n",$1,$2,$3)
++ }
++ ' "$CRYPTTAB"
+fi
---
-2.34.1
-
