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-01-27 23:16:15
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.1898 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Thu Jan 27 23:16:15 2022 rev:258 rq:948537 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2022-01-14
23:13:57.738659704 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.1898/grub2.changes 2022-01-27
23:16:16.523264817 +0100
@@ -8,0 +9,6 @@
+Thu Jan 13 06:36:44 UTC 2022 - Michael Chang <mch...@suse.com>
+
+- Fix wrong default entry when booting snapshot (bsc#1159205)
+ * grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2-btrfs-08-workaround-snapshot-menu-default-entry.patch ++++++
--- /var/tmp/diff_new_pack.vftVhe/_old 2022-01-27 23:16:20.219239282 +0100
+++ /var/tmp/diff_new_pack.vftVhe/_new 2022-01-27 23:16:20.223239254 +0100
@@ -1,8 +1,11 @@
-Index: grub-2.02~beta2/grub-core/normal/menu.c
+
+v2: Add menuentry "Help on bootable snapshot" to be excluded as default entry.
+
+Index: grub-2.06/grub-core/normal/menu.c
===================================================================
---- grub-2.02~beta2.orig/grub-core/normal/menu.c
-+++ grub-2.02~beta2/grub-core/normal/menu.c
-@@ -575,6 +575,44 @@ print_countdown (struct grub_term_coordi
+--- grub-2.06.orig/grub-core/normal/menu.c
++++ grub-2.06/grub-core/normal/menu.c
+@@ -574,6 +574,43 @@ print_countdown (struct grub_term_coordi
grub_refresh ();
}
@@ -15,10 +18,9 @@
+workaround_snapshot_menu_default_entry (grub_menu_t menu, const char *name,
int *default_entry)
+{
+ grub_menu_entry_t entry;
-+
-+ if ((entry = grub_menu_get_entry (menu, 0))
-+ && entry->submenu
-+ && grub_strncmp (entry->title, "Bootable snapshot", sizeof("Bootable
snapshot") - 1) == 0)
++ if ((entry = grub_menu_get_entry (menu, 0)) &&
++ ((entry->submenu && grub_strncmp (entry->title, "Bootable snapshot",
sizeof("Bootable snapshot") - 1) == 0) ||
++ (!entry->submenu && grub_strncmp (entry->title, "Help on bootable
snapshot", sizeof("Help on bootable snapshot") - 1) == 0)))
+ {
+ const char *val;
+
@@ -47,7 +49,7 @@
#define GRUB_MENU_PAGE_SIZE 10
/* Show the menu and handle menu entry selection. Returns the menu entry
-@@ -593,6 +631,8 @@ run_menu (grub_menu_t menu, int nested,
+@@ -592,6 +629,8 @@ run_menu (grub_menu_t menu, int nested,
default_entry = get_entry_number (menu, "default");
