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
20 lines
735 B
Diff
20 lines
735 B
Diff
--- a/util/grub.d/00_header.in
|
|
+++ b/util/grub.d/00_header.in
|
|
@@ -428,8 +428,14 @@
|
|
# Note: No $snapshot_num on *read-only* rollback! (bsc#901487)
|
|
cat <<EOF
|
|
if [ -n "\$extra_cmdline" ]; then
|
|
- submenu "Bootable snapshot #\$snapshot_num" {
|
|
- menuentry "If OK, run 'snapper rollback' and reboot." { true; }
|
|
+ menuentry "Help on bootable snapshot #\$snapshot_num" {
|
|
+ echo "Select the default entry of the snapshot boot menu."
|
|
+ echo "Examine the snapshot, and if it's OK,"
|
|
+ echo " run 'snapper rollback' and reboot."
|
|
+ echo "See 'System Rollback by Booting from Snapshots'"
|
|
+ echo " in the manual for more information."
|
|
+ echo " ** Hit Any Key to return to boot menu ** "
|
|
+ read
|
|
}
|
|
fi
|
|
EOF
|