From ce823e59bc2ee3a8fd89c4a0144a38696d2e25a52afaf53d7d6a884c86eb2a5c Mon Sep 17 00:00:00 2001
From: Stephan Kulow <coolo@suse.com>
Date: Wed, 5 Aug 2015 04:49:12 +0000
Subject: [PATCH] Accepting request 319863 from Base:System

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
---
 grub2-btrfs-05-grub2-mkconfig.patch | 9 +++++----
 grub2.changes                       | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/grub2-btrfs-05-grub2-mkconfig.patch b/grub2-btrfs-05-grub2-mkconfig.patch
index 3e0bfa1..2a7a417 100644
--- a/grub2-btrfs-05-grub2-mkconfig.patch
+++ b/grub2-btrfs-05-grub2-mkconfig.patch
@@ -52,17 +52,18 @@ Index: grub-2.02~beta2/util/grub.d/00_header.in
    load_env
  fi
  
-@@ -367,3 +377,14 @@ fi
+@@ -367,3 +377,15 @@ 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 \$snapshot_num' and reboot." { true; }
++    menuentry "If OK, run 'snapper rollback' and reboot." { true; }
 +  }
 +fi
 +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/util/grub-mkconfig.in
-@@ -250,7 +250,8 @@ export GRUB_DEFAULT \
+@@ -255,7 +255,8 @@ export GRUB_DEFAULT \
    GRUB_OS_PROBER_SKIP_LIST \
    GRUB_DISABLE_SUBMENU \
    GRUB_CMDLINE_LINUX_RECOVERY \
@@ -100,7 +101,7 @@ Index: grub-2.02~beta2/util/grub.d/10_linux.in
  	fi;;
      xzfs)
  	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
      hotkey=0
    else
diff --git a/grub2.changes b/grub2.changes
index cb16503..1870522 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -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