Accepting request 423923 from home:michael-chang:branches:devel:openSUSE:Factory

- shim-install : fix regression of password prompt (bsc#993764)

OBS-URL: https://build.opensuse.org/request/show/423923
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=119

shim-install

@@ -237,6 +237,7 @@ 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
@@ -257,8 +258,7 @@ fi
 cat <<EOF
 search --fs-uuid --set=root ${cfg_fs_uuid}
 set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
-normal_exit
-normal
+source "\${prefix}/${grub_cfg_basename}"
 EOF
 
 }

shim.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Aug 19 06:46:59 UTC 2016 - mchang@suse.com
+
+- shim-install : fix regression of password prompt (bsc#993764) 
+
 -------------------------------------------------------------------
 Fri Aug  5 02:53:54 UTC 2016 - glin@suse.com
 

shim.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package shim
 #
-# Copyright (c) 2016 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