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

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

Browse Source 
- shim-install: fix the $prefix to use grub2-mkrelpath for paths
  on btrfs subvolume (bnc#866690).

OBS-URL: https://build.opensuse.org/request/show/224828
OBS-URL: https://build.opensuse.org/package/show/devel:openSUSE:Factory/shim?expand=0&rev=64
This commit is contained in:
Gary Ching-Pang Lin 2014-03-06 04:08:12 +00:00 committed by Git OBS Bridge
parent 898a347233
commit 466149ebe7
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
shim-install
View File

@ -12,6 +12,7 @@ sysconfdir="/etc"
libdir="/usr/lib64" libdir="/usr/lib64"
source_dir="$libdir/efi" source_dir="$libdir/efi"
grub_probe="`which grub2-probe`" grub_probe="`which grub2-probe`"
grub_mkrelpath="`which grub2-mkrelpath`"
self="`basename $0`" self="`basename $0`"
grub_cfg="/boot/grub2/grub.cfg" grub_cfg="/boot/grub2/grub.cfg"
update_boot=no update_boot=no
@ -232,7 +233,7 @@ cfg_fs_uuid=`"$grub_probe" --target=fs_uuid "$grub_cfg_dirname"`
(cat << EOF (cat << EOF
search --fs-uuid --set=root ${cfg_fs_uuid} search --fs-uuid --set=root ${cfg_fs_uuid}
set prefix=(\${root})${grub_cfg_dirname} set prefix=(\${root})`${grub_mkrelpath} ${grub_cfg_dirname}`
EOF EOF
echo "configfile \$prefix/${grub_cfg_basename}") \ echo "configfile \$prefix/${grub_cfg_basename}") \
> "${efidir}/grub.cfg" > "${efidir}/grub.cfg"

6
shim.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 6 03:53:49 UTC 2014 - mchang@suse.com
- shim-install: fix the $prefix to use grub2-mkrelpath for paths
on btrfs subvolume (bnc#866690).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Mar 4 04:19:05 UTC 2014 - glin@suse.com Tue Mar 4 04:19:05 UTC 2014 - glin@suse.com