Hello community, here is the log from the commit of package shim for openSUSE:Factory checked in at 2016-03-16 10:25:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shim (Old) and /work/SRC/openSUSE:Factory/.shim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim" Changes: -------- --- /work/SRC/openSUSE:Factory/shim/shim.changes 2015-12-09 22:34:05.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.shim.new/shim.changes 2016-03-16 10:25:16.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 9 07:15:52 UTC 2016 - [email protected] + +- 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) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim.spec ++++++ --- /var/tmp/diff_new_pack.XrHjdD/_old 2016-03-16 10:25:17.000000000 +0100 +++ /var/tmp/diff_new_pack.XrHjdD/_new 2016-03-16 10:25:17.000000000 +0100 @@ -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 ++++++ shim-install ++++++ --- /var/tmp/diff_new_pack.XrHjdD/_old 2016-03-16 10:25:17.000000000 +0100 +++ /var/tmp/diff_new_pack.XrHjdD/_new 2016-03-16 10:25:17.000000000 +0100 @@ -11,9 +11,9 @@ 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 @@ 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 @@ 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 @@ 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 @@ # 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
