proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-07-27 15:45:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* Merge from Ubuntu:

Browse Source 
- debian/build-efi-images: Where possible, make use of the device path
    derived from the EFI Loaded Image Protocol to compute the prefix
    (LP: #1097570).
This commit is contained in:
Colin Watson 2013-09-18 17:01:02 +01:00
parent 0d76e9cc53
commit 81ad9ef00b
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
debian/build-efi-images vendored
View File

@ -47,10 +47,12 @@ echo 'normal (memdisk)/grub.cfg' >"$workdir/grub-bootstrap.cfg"
# Skeleton configuration file which finds the real boot disk. # Skeleton configuration file which finds the real boot disk.
cat >"$workdir/grub.cfg" <<EOF cat >"$workdir/grub.cfg" <<EOF
if ! search --file --set=root /.disk/info; then if [ -z "\$prefix" -o ! -e "\$prefix" ]; then
if ! search --file --set=root /.disk/info; then
search --file --set=root /.disk/mini-info search --file --set=root /.disk/mini-info
fi
set prefix=(\$root)/boot/grub
fi fi
set prefix=(\$root)/boot/grub
if [ -e \$prefix/$platform/grub.cfg ]; then if [ -e \$prefix/$platform/grub.cfg ]; then
source \$prefix/$platform/grub.cfg source \$prefix/$platform/grub.cfg
else else
@ -71,8 +73,9 @@ CD_MODULES="
GRUB_MODULES="$CD_MODULES lvm mdraid09 mdraid1x" GRUB_MODULES="$CD_MODULES lvm mdraid09 mdraid1x"
"$grub_mkimage" -O "$platform" -o "$outdir/gcd$efi_name.efi" \ "$grub_mkimage" -O "$platform" -o "$outdir/gcd$efi_name.efi" \
-d "$grub_core" -p /EFI/BOOT \ -d "$grub_core" \
-c "$workdir/grub-bootstrap.cfg" -m "$workdir/memdisk.fat" \ -c "$workdir/grub-bootstrap.cfg" -m "$workdir/memdisk.fat" \
-p /boot/grub \
$CD_MODULES $CD_MODULES
"$grub_mkimage" -O "$platform" -o "$outdir/grub$efi_name.efi" \ "$grub_mkimage" -O "$platform" -o "$outdir/grub$efi_name.efi" \
-d "$grub_core" -p /EFI/ubuntu $GRUB_MODULES -d "$grub_core" -p /EFI/ubuntu $GRUB_MODULES

9
debian/changelog vendored
View File

@ -1,3 +1,12 @@
grub2 (2.00-19) UNRELEASED; urgency=low
* Merge from Ubuntu:
- debian/build-efi-images: Where possible, make use of the device path
derived from the EFI Loaded Image Protocol to compute the prefix
(LP: #1097570).
-- Colin Watson <cjwatson@debian.org> Wed, 18 Sep 2013 17:00:27 +0100
grub2 (2.00-18) unstable; urgency=low grub2 (2.00-18) unstable; urgency=low
* Add gettext module to signed UEFI images (LP: #1104627). * Add gettext module to signed UEFI images (LP: #1104627).