fa8b2484d0
- Pull in fixes for TSC calibration driver preference (prefer pmtimer over PIT) to boot on Apollo Lake systems with no PIT - Fix pmtimer calibration to not take forever to fail on kvm. Signed-off-by: Peter Jones <pjones@redhat.com>
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From 24ffe7f751ba5ca1fcaef235f104c385091af25f Mon Sep 17 00:00:00 2001
|
|
From: Dusty Mabe <dusty@dustymabe.com>
|
|
Date: Sat, 18 Jul 2015 15:38:08 +0000
|
|
Subject: [PATCH 180/198] 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 e2a533001..8a16fea34 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
|
|
--
|
|
2.14.3
|
|
|