ec4acbbd98
- Try to fix things for new compiler madness. I really don't know why gcc decided __attribute__((packed)) on a "typedef struct" should imply __attribute__((align (1))) and that it should have a warning that it does so. The obvious behavior would be to keep the alignment of the first element unless it's used in another object or type that /also/ hask the packed attribute. Why should it change the default alignment at all? - Merge in the BLS patches Javier and I wrote. - Attempt to fix pmtimer initialization failures to not be super duper slow. Signed-off-by: Peter Jones <pjones@redhat.com>
35 lines
1.0 KiB
Diff
35 lines
1.0 KiB
Diff
From 01f78b61c49b62aeb5cd27f3cbc479d4177ccf7d 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/206] 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
|
|
--
|
|
2.15.0
|
|
|