mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-10-19 02:05:42 +00:00
1f092caba7
Add comments and revert logic changes in 01_fallback_counting Remove quotes when reading ID value from /etc/os-release Related: rhbz#1650706 blscfg: expand grub_users before passing to grub_normal_add_menu_entry() Resolves: rhbz#1650706 Drop buggy downstream patch "efinet: retransmit if our device is busy" Resolves: rhbz#1649048 Make the menu entry users option argument to be optional Related: rhbz#1652434 10_linux_bls: add missing menu entries options Resolves: rhbz#1652434 Drop "Be more aggro about actually using the *configured* network device." Resolves: rhbz#1654388 Fix menu entry selection based on title Resolves: rhbz#1654936 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
31 lines
1,009 B
Diff
31 lines
1,009 B
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Dusty Mabe <dusty@dustymabe.com>
|
|
Date: Sat, 18 Jul 2015 15:38:08 +0000
|
|
Subject: [PATCH] No more "Bootable Snapshot" submenu in grub.cfg.
|
|
|
|
This breaks grubby (run on kernel upgrades) because grubby just
|
|
does a search for "menuentry".
|
|
---
|
|
util/grub.d/00_header.in | 12 ------------
|
|
1 file changed, 12 deletions(-)
|
|
|
|
diff --git a/util/grub.d/00_header.in b/util/grub.d/00_header.in
|
|
index e2a53300126..8a16fea347e 100644
|
|
--- a/util/grub.d/00_header.in
|
|
+++ b/util/grub.d/00_header.in
|
|
@@ -366,15 +366,3 @@ fi
|
|
if [ "x${GRUB_BADRAM}" != "x" ] ; then
|
|
echo "badram ${GRUB_BADRAM}"
|
|
fi
|
|
-
|
|
-if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
|
|
- [ "x${GRUB_FS}" = "xbtrfs" ] ; then
|
|
- # 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; }
|
|
- }
|
|
-fi
|
|
-EOF
|
|
-fi
|