From 466149ebe7c1aab6a17428189a5e1626323e6d681e3d90c820822072a935e47c Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Thu, 6 Mar 2014 04:08:12 +0000
Subject: [PATCH] Accepting request 224828 from
 home:michael-chang:branches:devel:openSUSE:Factory

- shim-install: fix the $prefix to use grub2-mkrelpath for paths
  on btrfs subvolume (bnc#866690).

OBS-URL: https://build.opensuse.org/request/show/224828
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=64
---
 shim-install | 3 ++-
 shim.changes | 6 ++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/shim-install b/shim-install
index a23acdc..37fa9b1 100644
--- a/shim-install
+++ b/shim-install
@@ -12,6 +12,7 @@ sysconfdir="/etc"
 libdir="/usr/lib64"
 source_dir="$libdir/efi"
 grub_probe="`which grub2-probe`"
+grub_mkrelpath="`which grub2-mkrelpath`"
 self="`basename $0`"
 grub_cfg="/boot/grub2/grub.cfg"
 update_boot=no
@@ -232,7 +233,7 @@ cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"`
 
 (cat << EOF
 search --fs-uuid --set=root ${cfg_fs_uuid}
-set prefix=(\${root})${grub_cfg_dirname}
+set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
 EOF
 echo "configfile \$prefix/${grub_cfg_basename}") \
 > "${efidir}/grub.cfg"
diff --git a/shim.changes b/shim.changes
index a98c01e..452e061 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Mar  6 03:53:49 UTC 2014 - mchang@suse.com
+
+- shim-install: fix the $prefix to use grub2-mkrelpath for paths
+  on btrfs subvolume (bnc#866690).
+
 -------------------------------------------------------------------
 Tue Mar  4 04:19:05 UTC 2014 - glin@suse.com