Hello community, here is the log from the commit of package shim for openSUSE:Factory checked in at 2017-04-11 09:28:32 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/shim (Old) and /work/SRC/openSUSE:Factory/.shim.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "shim" Tue Apr 11 09:28:32 2017 rev:56 rq:483743 version:0.9 Changes: -------- --- /work/SRC/openSUSE:Factory/shim/shim.changes 2017-02-26 17:00:27.919908628 +0100 +++ /work/SRC/openSUSE:Factory/.shim.new/shim.changes 2017-04-11 09:28:36.629370970 +0200 @@ -1,0 +2,5 @@ +Wed Mar 22 10:54:41 UTC 2017 - [email protected] + +- shim-install: add option --suse-enable-tpm (fate#315831) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ shim-install ++++++ --- /var/tmp/diff_new_pack.Q1h3PY/_old 2017-04-11 09:28:38.561098152 +0200 +++ /var/tmp/diff_new_pack.Q1h3PY/_new 2017-04-11 09:28:38.561098152 +0200 @@ -18,6 +18,7 @@ self="`basename $0`" grub_cfg="/boot/grub2/grub.cfg" update_boot=no +def_grub_efi="${source_dir}/grub.efi" # Get GRUB_DISTRIBUTOR. if test -f "${sysconfdir}/default/grub" ; then @@ -58,6 +59,7 @@ echo "--efi-directory=DIR use DIR as the EFI System Partition root." echo "--config-file=FILE use FILE as config file, default is $grub_cfg." echo "--clean remove all installed files and configs." + echo "--suse-enable-tpm install grub.efi with TPM support." echo echo "INSTALL_DEVICE must be system device filename." } @@ -121,6 +123,9 @@ --no-nvram) no_nvram=yes ;; + --suse-enable-tpm) + source_grub_efi="/usr/lib/grub2/x86_64-efi/grub-tpm.efi" ;; + --clean) clean=yes ;; @@ -235,7 +240,18 @@ fi cp "${source_dir}/MokManager.efi" "${efidir}" -cp "${source_dir}/grub.efi" "${efidir}" + +if test -n "$source_grub_efi" && ! test -f "$source_grub_efi"; then + echo "File $source_grub_efi doesn't exist, fallback to default one" 1>&2 + source_grub_efi="" +fi + +if test -z "$source_grub_efi"; then + source_grub_efi="$def_grub_efi" +fi + +echo "copying $source_grub_efi to ${efidir}/grub.efi" +cp "$source_grub_efi" "${efidir}/grub.efi" if test "$efidir" != "$efibootdir" ; then cp "${source_dir}/shim.efi" "${efidir}"
