From 2562b2ffceb9d5644c700c634cf409f859a4ef90d4c00ccdac42f876422dd59a Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Tue, 29 Apr 2014 07:55:23 +0000
Subject: [PATCH] Accepting request 231974 from
 home:michael-chang:branches:devel:openSUSE:Factory

- shim-install: fix boot partition and rollback support kluge
  (bnc#875385)

OBS-URL: https://build.opensuse.org/request/show/231974
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=74
---
 shim-install | 45 +++++----------------------------------------
 shim.changes |  6 ++++++
 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/shim-install b/shim-install
index 93c1ddc..1248a09 100644
--- a/shim-install
+++ b/shim-install
@@ -233,55 +233,20 @@ make_grubcfg () {
 grub_cfg_dirname=`dirname $grub_cfg`
 grub_cfg_basename=`basename $grub_cfg`
 cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"`
-descriptive_config="snapshot_submenu.cfg"
-root_fstype=`$grub_probe -t fs /`
-boot_fstype=`$grub_probe -t fs /boot`
-if [ "x${root_fstype}" != "xbtrfs" ] ||
-   [ "x${boot_fstype}" != "xbtrfs" ]; then
-    echo "/ is not on btrfs" >&2
-    exit 1;
-fi
-
-if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue" &&
-   test "x$root_fstype" = "xbtrfs" &&
-   test "x$boot_fstype" = "xbtrfs"; then
 
+if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue"; then
 cat <<EOF
 set btrfs_relative_path="yes"
-set extra_cmdline=""
-btrfs_subvolid=""
-btrfs_subvol="/"
-
-export btrfs_relative_path
-export extra_cmdline
-
-search --fs-uuid --set=root ${cfg_fs_uuid}
-
-set timeout=0
-
-terminal_input console
-terminal_output console
-
-menuentry 'default' {
-  btrfs_subvol=""
-  configfile /boot/grub2/grub.cfg
-  btrfs_subvol="/"
-}
-
-if [ -f "/.snapshots/${descriptive_config}" ]; then
-  source "/.snapshots/${descriptive_config}"
-fi
-
 EOF
-
-else
-
+if ${grub_mkrelpath} --usage | grep -q -e '--relative'; then
+  grub_mkrelpath="${grub_mkrelpath} -r"
+fi
+fi
 cat <<EOF
 search --fs-uuid --set=root ${cfg_fs_uuid}
 set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
 configfile \$prefix/${grub_cfg_basename}
 EOF
-fi
 
 }
 
diff --git a/shim.changes b/shim.changes
index 73c47f0..840552d 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Apr 29 07:38:11 UTC 2014 - mchang@suse.com
+
+- shim-install: fix boot partition and rollback support kluge
+  (bnc#875385) 
+
 -------------------------------------------------------------------
 Thu Apr 10 08:20:20 UTC 2014 - glin@suse.com