rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 319863 from Base:System

Browse Source 
1

OBS-URL: https://build.opensuse.org/request/show/319863
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=122
This commit is contained in:
Stephan Kulow 2015-08-05 04:49:12 +00:00 committed by Git OBS Bridge
parent 37ed38dc8a
commit ce823e59bc
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
grub2-btrfs-05-grub2-mkconfig.patch
View File

@ -52,17 +52,18 @@ Index: grub-2.02~beta2/util/grub.d/00_header.in
load_env load_env
fi fi
@@ -367,3 +377,14 @@ fi @@ -367,3 +377,15 @@ fi
if [ "x${GRUB_BADRAM}" != "x" ] ; then if [ "x${GRUB_BADRAM}" != "x" ] ; then
echo "badram ${GRUB_BADRAM}" echo "badram ${GRUB_BADRAM}"
fi fi
+ +
+if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] && +if [ "x${SUSE_BTRFS_SNAPSHOT_BOOTING}" = "xtrue" ] &&
+ [ "x${GRUB_FS}" = "xbtrfs" ] ; then + [ "x${GRUB_FS}" = "xbtrfs" ] ; then
+ # Note: No $snapshot_num on *read-only* rollback! (bsc#901487)
+ cat <<EOF + cat <<EOF
+if [ -n "\$extra_cmdline" ]; then +if [ -n "\$extra_cmdline" ]; then
+ submenu "Bootable snapshot #\$snapshot_num" { + submenu "Bootable snapshot #\$snapshot_num" {
+ menuentry "If OK, run 'snapper rollback \$snapshot_num' and reboot." { true; } + menuentry "If OK, run 'snapper rollback' and reboot." { true; }
+ } + }
+fi +fi
+EOF +EOF
@ -71,7 +72,7 @@ Index: grub-2.02~beta2/util/grub-mkconfig.in
=================================================================== ===================================================================
--- grub-2.02~beta2.orig/util/grub-mkconfig.in --- grub-2.02~beta2.orig/util/grub-mkconfig.in
+++ grub-2.02~beta2/util/grub-mkconfig.in +++ grub-2.02~beta2/util/grub-mkconfig.in
@@ -250,7 +250,8 @@ export GRUB_DEFAULT \ @@ -255,7 +255,8 @@ export GRUB_DEFAULT \
GRUB_OS_PROBER_SKIP_LIST \ GRUB_OS_PROBER_SKIP_LIST \
GRUB_DISABLE_SUBMENU \ GRUB_DISABLE_SUBMENU \
GRUB_CMDLINE_LINUX_RECOVERY \ GRUB_CMDLINE_LINUX_RECOVERY \
@ -100,7 +101,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
fi;; fi;;
xzfs) xzfs)
rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true` rpool=`${grub_probe} --device ${GRUB_DEVICE} --target=fs_label 2>/dev/null || true`
@@ -230,7 +234,12 @@ while [ "x$list" != "x" ] ; do @@ -237,7 +241,12 @@ while [ "x$list" != "x" ] ; do
if [ $PLATFORM != "emu" ]; then if [ $PLATFORM != "emu" ]; then
hotkey=0 hotkey=0
else else

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jul 31 03:55:32 UTC 2015 - mchang@suse.com
- fix for 'rollback' hint (bsc#901487)
* modified grub2-btrfs-05-grub2-mkconfig.patch:
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 17 08:44:24 UTC 2015 - mchang@suse.com Fri Jul 17 08:44:24 UTC 2015 - mchang@suse.com