pool/shim
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
This commit is contained in:
Gary Ching-Pang Lin 2016-03-09 09:57:29 +00:00 committed by Git OBS Bridge
parent 04c16aa6a1
commit ff93d13920
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
shim-install
View File

@ -11,9 +11,9 @@ clean=no
sysconfdir="/etc" sysconfdir="/etc"
libdir="/usr/lib64" libdir="/usr/lib64"
source_dir="$libdir/efi" source_dir="$libdir/efi"
grub_probe="`which grub2-probe`" grub_probe="/usr/sbin/grub2-probe"
grub_mkrelpath="`which grub2-mkrelpath`" grub_mkrelpath="/usr/bin/grub2-mkrelpath"
grub_install="`which grub2-install`" grub_install="/usr/sbin/grub2-install"
self="`basename $0`" self="`basename $0`"
grub_cfg="/boot/grub2/grub.cfg" grub_cfg="/boot/grub2/grub.cfg"
update_boot=no update_boot=no
@ -213,8 +213,7 @@ if test "$clean" = "yes"; then
rm -f "${efibootdir}/bootx64.efi" rm -f "${efibootdir}/bootx64.efi"
rm -f "${efibootdir}/fallback.efi" rm -f "${efibootdir}/fallback.efi"
fi fi
efibootmgr="`which efibootmgr`" if test "$removable" = no && test -n "$bootloader_id"; then
if test "$removable" = no && test -n "$bootloader_id" && test -n "$efibootmgr"; then
# Delete old entries from the same distributor. # Delete old entries from the same distributor.
for bootnum in `efibootmgr | grep '^Boot[0-9]' | \ for bootnum in `efibootmgr | grep '^Boot[0-9]' | \
fgrep -i " $bootloader_id" | cut -b5-8`; do fgrep -i " $bootloader_id" | cut -b5-8`; do
@ -237,7 +236,6 @@ fi
make_grubcfg () { make_grubcfg () {
grub_cfg_dirname=`dirname $grub_cfg` grub_cfg_dirname=`dirname $grub_cfg`
grub_cfg_basename=`basename $grub_cfg`
cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"` cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"`
if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue"; then if test "x$SUSE_BTRFS_SNAPSHOT_BOOTING" = "xtrue"; then
@ -258,7 +256,8 @@ fi
cat <<EOF cat <<EOF
search --fs-uuid --set=root ${cfg_fs_uuid} search --fs-uuid --set=root ${cfg_fs_uuid}
set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}` set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
configfile \$prefix/${grub_cfg_basename} normal_exit
normal
EOF EOF
} }
@ -268,8 +267,7 @@ make_grubcfg > "${efidir}/grub.cfg"
# invoke grub_install to initialize /boot/grub2 directory with files needed by grub.cfg # invoke grub_install to initialize /boot/grub2 directory with files needed by grub.cfg
${grub_install} --no-nvram ${grub_install} --no-nvram
efibootmgr="`which efibootmgr`" if test "$removable" = no && test -n "$bootloader_id"; then
if test "$removable" = no && test -n "$bootloader_id" && test -n "$efibootmgr"; then
modprobe -q efivars 2>/dev/null || true modprobe -q efivars 2>/dev/null || true

7
shim.changes
View File

@ -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 Thu Dec 3 10:26:14 UTC 2015 - jsegitz@novell.com

2
shim.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package shim # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed