forked from pool/grub2
8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
59 lines
1.8 KiB
Diff
59 lines
1.8 KiB
Diff
|
|
v2: Add menuentry "Help on bootable snapshot" to be excluded as default entry.
|
|
|
|
--- a/grub-core/normal/menu.c
|
|
+++ b/grub-core/normal/menu.c
|
|
@@ -574,6 +574,43 @@
|
|
grub_refresh ();
|
|
}
|
|
|
|
+/* bsc#956046 - The first entry titled 'Bootable snapshot #$NUM' is inserted on
|
|
+ top at runtime to display current snapshot information. If default entry is
|
|
+ using number as key to index the entry, the result will be shifted so here we
|
|
+ add specical handling to shift it back. We apply this workaround until a better
|
|
+ solution can be found. */
|
|
+static void
|
|
+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) ||
|
|
+ (!entry->submenu && grub_strncmp (entry->title, "Help on bootable snapshot", sizeof("Help on bootable snapshot") - 1) == 0)))
|
|
+ {
|
|
+ const char *val;
|
|
+
|
|
+ if (*default_entry == -1 && menu->size > 1)
|
|
+ {
|
|
+ *default_entry = 1;
|
|
+ return;
|
|
+ }
|
|
+
|
|
+ val = grub_env_get (name);
|
|
+
|
|
+ grub_error_push ();
|
|
+
|
|
+ if (val)
|
|
+ grub_strtoul (val, 0, 0);
|
|
+
|
|
+ if (*default_entry < (menu->size - 1) && grub_errno == GRUB_ERR_NONE)
|
|
+ ++(*default_entry);
|
|
+
|
|
+ grub_error_pop ();
|
|
+ }
|
|
+
|
|
+ return;
|
|
+}
|
|
+
|
|
#define GRUB_MENU_PAGE_SIZE 10
|
|
|
|
/* Show the menu and handle menu entry selection. Returns the menu entry
|
|
@@ -594,6 +631,8 @@
|
|
|
|
default_entry = get_entry_number (menu, "default");
|
|
|
|
+ workaround_snapshot_menu_default_entry (menu, "default", &default_entry);
|
|
+
|
|
/* If DEFAULT_ENTRY is not within the menu entries, fall back to
|
|
the first entry. */
|
|
if (default_entry < 0 || default_entry >= menu->size)
|