From ff93d1392067ebe27e45ff330b04e962a2f83a6316c72af97ceef20537c441be Mon Sep 17 00:00:00 2001
From: Gary Ching-Pang Lin <glin@suse.com>
Date: Wed, 9 Mar 2016 09:57:29 +0000
Subject: [PATCH] Accepting request 368964 from
 home:michael-chang:branches:devel:openSUSE:Factory

- shim-install : fix typing ESC can escape to parent config which is
  in command mode and cannot return back (bsc#966701)
- shim-install : fix no which command for JeOS (bsc#968264)

OBS-URL: https://build.opensuse.org/request/show/368964
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=110
---
 shim-install | 16 +++++++---------
 shim.changes |  7 +++++++
 shim.spec    |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/shim-install b/shim-install
index aa54ca9..925ad1d 100644
--- a/shim-install
+++ b/shim-install
@@ -11,9 +11,9 @@ clean=no
 sysconfdir="/etc"
 libdir="/usr/lib64"
 source_dir="$libdir/efi"
-grub_probe="`which grub2-probe`"
-grub_mkrelpath="`which grub2-mkrelpath`"
-grub_install="`which grub2-install`"
+grub_probe="/usr/sbin/grub2-probe"
+grub_mkrelpath="/usr/bin/grub2-mkrelpath"
+grub_install="/usr/sbin/grub2-install"
 self="`basename $0`"
 grub_cfg="/boot/grub2/grub.cfg"
 update_boot=no
@@ -213,8 +213,7 @@ if test "$clean" = "yes"; then
         rm -f "${efibootdir}/bootx64.efi"
         rm -f "${efibootdir}/fallback.efi"
     fi
-    efibootmgr="`which efibootmgr`"
-    if test "$removable" = no && test -n "$bootloader_id" && test -n "$efibootmgr"; then
+    if test "$removable" = no && test -n "$bootloader_id"; then
         # Delete old entries from the same distributor.
         for bootnum in `efibootmgr | grep '^Boot[0-9]' | \
             fgrep -i " $bootloader_id" | cut -b5-8`; do
@@ -237,7 +236,6 @@ fi
 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"`
 
 if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue"; then
@@ -258,7 +256,8 @@ fi
 cat <<EOF
 search --fs-uuid --set=root ${cfg_fs_uuid}
 set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
-configfile \$prefix/${grub_cfg_basename}
+normal_exit
+normal
 EOF
 
 }
@@ -268,8 +267,7 @@ make_grubcfg > "${efidir}/grub.cfg"
 # invoke grub_install to initialize /boot/grub2 directory with files needed by grub.cfg
 ${grub_install} --no-nvram
 
-efibootmgr="`which efibootmgr`"
-if test "$removable" = no && test -n "$bootloader_id" && test -n "$efibootmgr"; then
+if test "$removable" = no && test -n "$bootloader_id"; then
 
     modprobe -q efivars 2>/dev/null || true
 
diff --git a/shim.changes b/shim.changes
index 2234edd..06f509d 100644
--- a/shim.changes
+++ b/shim.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Mar  9 07:15:52 UTC 2016 - mchang@suse.com
+
+- shim-install : fix typing ESC can escape to parent config which is
+  in command mode and cannot return back (bsc#966701) 
+- shim-install : fix no which command for JeOS (bsc#968264)
+
 -------------------------------------------------------------------
 Thu Dec  3 10:26:14 UTC 2015 - jsegitz@novell.com
 
diff --git a/shim.spec b/shim.spec
index a00b7a1..6091d2e 100644
--- a/shim.spec
+++ b/shim.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package shim
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed