Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2025-02-21 21:35:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.1873 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Fri Feb 21 21:35:23 2025 rev:347 rq:1247577 version:2.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2025-02-19
15:58:27.803859642 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.1873/grub2.changes 2025-02-21
21:35:39.658473147 +0100
@@ -1,0 +2,6 @@
+Wed Feb 19 07:12:23 UTC 2025 - Michael Chang <mch...@suse.com>
+
+- Fix grub-bls does not rollback via setting new default (bsc#1237198)
+ * 0001-bls-Accept-.conf-suffix-in-setting-default-entry.patch
+
+-------------------------------------------------------------------
New:
----
0001-bls-Accept-.conf-suffix-in-setting-default-entry.patch
BETA DEBUG BEGIN:
New:- Fix grub-bls does not rollback via setting new default (bsc#1237198)
* 0001-bls-Accept-.conf-suffix-in-setting-default-entry.patch
BETA DEBUG END:
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2.spec ++++++
--- /var/tmp/diff_new_pack.yY9na3/_old 2025-02-21 21:35:45.546718315 +0100
+++ /var/tmp/diff_new_pack.yY9na3/_new 2025-02-21 21:35:45.550718481 +0100
@@ -437,6 +437,7 @@
Patch256: 0018-fs-bfs-Disable-under-lockdown.patch
Patch257: 0019-fs-Disable-many-filesystems-under-lockdown.patch
Patch258: 0020-fs-Prevent-overflows-when-allocating-memory-for-arra.patch
+Patch259: 0001-bls-Accept-.conf-suffix-in-setting-default-entry.patch
%if 0%{?suse_version} <= 1600
Requires: gettext-runtime
++++++ 0001-bls-Accept-.conf-suffix-in-setting-default-entry.patch ++++++
>From e873743f4ed7841542dd7dc11a183cb136670382 Mon Sep 17 00:00:00 2001
From: Michael Chang <mch...@suse.com>
Date: Wed, 19 Feb 2025 14:52:52 +0800
Subject: [PATCH] bls: Accept .conf suffix in setting default entry
Signed-off-by: Michael Chang <mch...@suse.com>
---
grub-core/normal/menu.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/grub-core/normal/menu.c b/grub-core/normal/menu.c
index b11b28e0d9..dfdf0c7268 100644
--- a/grub-core/normal/menu.c
+++ b/grub-core/normal/menu.c
@@ -557,6 +557,26 @@ get_entry_number (grub_menu_t menu, const char *name)
entry = i;
break;
}
+
+ if (e->bls)
+ {
+ char *v, *ext;
+
+ if ((v = grub_strdup (val)) &&
+ (ext = grub_strrchr (v, '.')) &&
+ grub_strcmp (ext, ".conf") == 0)
+ {
+ *ext = '\0';
+ if (menuentry_eq (e->id, v))
+ {
+ entry = i;
+ grub_free (v);
+ break;
+ }
+ }
+ grub_free (v);
+ }
+
e = e->next;
/* Skip hidden entries */
--
2.48.1
