Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2015-08-05 06:49:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2015-07-21 13:25:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new/grub2.changes 2015-08-05 06:49:14.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Jul 31 03:55:32 UTC 2015 - [email protected] + +- fix for 'rollback' hint (bsc#901487) + * modified grub2-btrfs-05-grub2-mkconfig.patch: + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2-btrfs-05-grub2-mkconfig.patch ++++++ --- /var/tmp/diff_new_pack.dcgJE9/_old 2015-08-05 06:49:17.000000000 +0200 +++ /var/tmp/diff_new_pack.dcgJE9/_new 2015-08-05 06:49:17.000000000 +0200 @@ -52,17 +52,18 @@ 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 @@ =================================================================== --- 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 @@ 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
