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-14 14:28:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.1597 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Mon Nov 14 14:28:44 2022 rev:273 rq:1035611 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2022-11-09
12:56:56.360180110 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.1597/grub2.changes 2022-11-14
14:28:46.594904018 +0100
@@ -1,0 +2,12 @@
+Mon Nov 14 09:54:16 UTC 2022 - Michael Chang <mch...@suse.com>
+
+- Removed 0001-linux-fix-efi_relocate_kernel-failure.patch as reported
+ regression in some hardware being stuck in initrd loading (bsc#1205380)
+
+-------------------------------------------------------------------
+Mon Nov 14 03:03:35 UTC 2022 - Michael Chang <mch...@suse.com>
+
+- Fix password asked twice if third field in crypttab not present (bsc#1205312)
+ * 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch
+
+-------------------------------------------------------------------
Old:
----
0001-linux-fix-efi_relocate_kernel-failure.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.ZZwEzL/_old 2022-11-14 14:28:50.054922116 +0100
+++ /var/tmp/diff_new_pack.ZZwEzL/_new 2022-11-14 14:28:50.062922158 +0100
@@ -453,7 +453,6 @@
# powerpc-ieee1275
Patch926:
0001-grub-install-set-point-of-no-return-for-powerpc-ieee1275.patch
Patch927: safe_tpm_pcr_snapshot.patch
-Patch928: 0001-linux-fix-efi_relocate_kernel-failure.patch
# (PED-996) NVMeoFC support on Grub (grub2)
Patch929: 0001-ieee1275-add-support-for-NVMeoFC.patch
Patch930: 0002-ieee1275-ofpath-enable-NVMeoF-logical-device-transla.patch
++++++ 0009-Add-crypttab_entry-to-obviate-the-need-to-input-pass.patch ++++++
--- /var/tmp/diff_new_pack.ZZwEzL/_old 2022-11-14 14:28:50.366923748 +0100
+++ /var/tmp/diff_new_pack.ZZwEzL/_new 2022-11-14 14:28:50.370923769 +0100
@@ -22,11 +22,11 @@
Signed-off-by: Michael Chang <mch...@suse.com>
---
grub-core/Makefile.core.def | 5 +
- grub-core/commands/crypttab.c | 42 ++++++++++++
+ grub-core/commands/crypttab.c | 47 ++++++++++++++
grub-core/disk/cryptodisk.c | 6 +
grub-core/loader/linux.c | 137
++++++++++++++++++++++++++++++++++++++++--
include/grub/linux.h | 3
- 5 files changed, 188 insertions(+), 5 deletions(-)
+ 5 files changed, 193 insertions(+), 5 deletions(-)
create mode 100644 grub-core/commands/crypttab.c
--- a/grub-core/Makefile.core.def
@@ -42,7 +42,7 @@
+};
--- /dev/null
+++ b/grub-core/commands/crypttab.c
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,47 @@
+
+#include <grub/dl.h>
+#include <grub/command.h>
@@ -57,13 +57,18 @@
+ int argc, char **argv)
+{
+ char buf[64];
-+ const char *path = argv[2];
++ const char *path = NULL;
+
-+ if (argc != 3)
-+ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("three arguments expected"));
-+
-+ if (grub_strcmp (argv[2], "none") == 0
-+ || grub_strcmp (argv[2], "-") == 0)
++ if (argc == 2)
++ path = NULL;
++ else if (argc == 3)
++ path = argv[2];
++ else
++ return grub_error (GRUB_ERR_BAD_ARGUMENT, N_("two or three arguments
expected"));
++
++ if (!path
++ || grub_strcmp (path, "none") == 0
++ || grub_strcmp (path, "-") == 0)
+ {
+ grub_snprintf (buf, sizeof (buf), "/etc/cryptsetup-keys.d/%s.key",
argv[0]);
+ path = buf;
