From 12d0642c1acbacc5ad1f0a872d2a06dbce56ee228a011959cb1649adcdc10552 Mon Sep 17 00:00:00 2001 From: Gary Ching-Pang Lin Date: Mon, 4 Aug 2014 09:46:50 +0000 Subject: [PATCH] Accepting request 243573 from home:michael-chang:branches:devel:openSUSE:Factory - shim-install: fix GRUB shows broken letters at boot by calling grub2-install to initialize /boot/grub2 directory with files needed by grub.cfg (bnc#889765) OBS-URL: https://build.opensuse.org/request/show/243573 OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=77 --- shim-install | 4 ++++ shim.changes | 7 +++++++ shim.spec | 3 ++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/shim-install b/shim-install index 1248a09..8478468 100644 --- a/shim-install +++ b/shim-install @@ -13,6 +13,7 @@ libdir="/usr/lib64" source_dir="$libdir/efi" grub_probe="`which grub2-probe`" grub_mkrelpath="`which grub2-mkrelpath`" +grub_install="`which grub2-install`" self="`basename $0`" grub_cfg="/boot/grub2/grub.cfg" update_boot=no @@ -251,6 +252,9 @@ EOF } make_grubcfg > "${efidir}/grub.cfg" +# bnc#889765 GRUB shows broken letters at boot +# 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 diff --git a/shim.changes b/shim.changes index 29afcc1..400bdd6 100644 --- a/shim.changes +++ b/shim.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Mon Aug 4 07:53:22 UTC 2014 - mchang@suse.com + +- shim-install: fix GRUB shows broken letters at boot by calling + grub2-install to initialize /boot/grub2 directory with files + needed by grub.cfg (bnc#889765) + ------------------------------------------------------------------- Wed May 28 04:13:33 UTC 2014 - glin@suse.com diff --git a/shim.spec b/shim.spec index 8af920c..68eb52b 100644 --- a/shim.spec +++ b/shim.spec @@ -85,7 +85,8 @@ BuildRequires: pesign BuildRequires: pesign-obs-integration Requires: perl-Bootloader BuildRoot: %{_tmppath}/%{name}-%{version}-build -Recommends: grub2-efi +# For shim-install script +Requires: grub2-efi ExclusiveArch: x86_64 %description