proxmox-mirrors/grub2
1
0
Fork 0
mirror of https://git.proxmox.com/git/grub2 synced 2025-10-24 19:39:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Only run /etc/grub.d/30_uefi-firmware for the x86 platform.

Browse Source
This commit is contained in:
Colin Watson 2013-12-23 21:31:14 +00:00
parent 781621b8d3
commit 16fbc21a7f
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -30,8 +30,9 @@ grub2 (2.02~beta1-1) UNRELEASED; urgency=low
* Install grub-file in grub-common. * Install grub-file in grub-common.
* Fix crash due to pointer confusion in grub-mkdevicemap, introduced while * Fix crash due to pointer confusion in grub-mkdevicemap, introduced while
converting away from nested functions in 2.00+20131208-1. converting away from nested functions in 2.00+20131208-1.
* Add more grub.d scripts (05_debian_theme and 30_uefi-firmware) to the * Add another grub.d script (05_debian_theme) to the list that should be
list that should be run only once. run only once.
* Only run /etc/grub.d/30_uefi-firmware for the x86 platform.
-- Colin Watson <cjwatson@debian.org> Tue, 10 Dec 2013 17:39:47 +0000 -- Colin Watson <cjwatson@debian.org> Tue, 10 Dec 2013 17:39:47 +0000

4
debian/patches/mkconfig_more_scripts_once.patch vendored
View File

@ -7,13 +7,11 @@ Index: b/util/grub-mkconfig.in
=================================================================== ===================================================================
--- a/util/grub-mkconfig.in --- a/util/grub-mkconfig.in
+++ b/util/grub-mkconfig.in +++ b/util/grub-mkconfig.in
@@ -275,7 +275,9 @@ @@ -275,6 +275,7 @@
for i in "${grub_mkconfig_dir}"/* ; do for i in "${grub_mkconfig_dir}"/* ; do
case "$i" in case "$i" in
"${grub_mkconfig_dir}"/00_header \ "${grub_mkconfig_dir}"/00_header \
+ | "${grub_mkconfig_dir}"/05_debian_theme \ + | "${grub_mkconfig_dir}"/05_debian_theme \
| "${grub_mkconfig_dir}"/30_os-prober \ | "${grub_mkconfig_dir}"/30_os-prober \
+ | "${grub_mkconfig_dir}"/30_uefi-firmware \
| "${grub_mkconfig_dir}"/40_custom \ | "${grub_mkconfig_dir}"/40_custom \
| "${grub_mkconfig_dir}"/41_custom) | "${grub_mkconfig_dir}"/41_custom)
echo

8
debian/patches/uefi_firmware_setup.patch vendored
View File

@ -1,7 +1,7 @@
Description: Output a menu entry for firmware setup on UEFI FastBoot systems Description: Output a menu entry for firmware setup on UEFI FastBoot systems
Author: Steve Langasek <steve.langasek@ubuntu.com> Author: Steve Langasek <steve.langasek@ubuntu.com>
Forwarded: no Forwarded: no
Last-Update: 2013-12-20 Last-Update: 2013-12-23
Index: b/Makefile.util.def Index: b/Makefile.util.def
=================================================================== ===================================================================
@ -24,7 +24,7 @@ Index: b/util/grub.d/30_uefi-firmware.in
=================================================================== ===================================================================
--- /dev/null --- /dev/null
+++ b/util/grub.d/30_uefi-firmware.in +++ b/util/grub.d/30_uefi-firmware.in
@@ -0,0 +1,46 @@ @@ -0,0 +1,50 @@
+#! /bin/sh +#! /bin/sh
+set -e +set -e
+ +
@ -53,6 +53,10 @@ Index: b/util/grub.d/30_uefi-firmware.in
+ +
+. "@datadir@/@PACKAGE@/grub-mkconfig_lib" +. "@datadir@/@PACKAGE@/grub-mkconfig_lib"
+ +
+if [ x$GRUB_PLATFORM != xx86 ]; then
+ exit 0
+fi
+
+efi_vars_dir=/sys/firmware/efi/vars +efi_vars_dir=/sys/firmware/efi/vars
+EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c +EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
+OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data" +OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"

1
util/grub-mkconfig.in
View File

@ -277,7 +277,6 @@ for i in "${grub_mkconfig_dir}"/* ; do
"${grub_mkconfig_dir}"/00_header \ "${grub_mkconfig_dir}"/00_header \
| "${grub_mkconfig_dir}"/05_debian_theme \ | "${grub_mkconfig_dir}"/05_debian_theme \
| "${grub_mkconfig_dir}"/30_os-prober \ | "${grub_mkconfig_dir}"/30_os-prober \
| "${grub_mkconfig_dir}"/30_uefi-firmware \
| "${grub_mkconfig_dir}"/40_custom \ | "${grub_mkconfig_dir}"/40_custom \
| "${grub_mkconfig_dir}"/41_custom) | "${grub_mkconfig_dir}"/41_custom)
echo echo

4
util/grub.d/30_uefi-firmware.in
View File

@ -26,6 +26,10 @@ export TEXTDOMAINDIR="@localedir@"
. "@datadir@/@PACKAGE@/grub-mkconfig_lib" . "@datadir@/@PACKAGE@/grub-mkconfig_lib"
if [ x$GRUB_PLATFORM != xx86 ]; then
exit 0
fi
efi_vars_dir=/sys/firmware/efi/vars efi_vars_dir=/sys/firmware/efi/vars
EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c EFI_GLOBAL_VARIABLE=8be4df61-93ca-11d2-aa0d-00e098032b8c
OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data" OsIndications="$efi_vars_dir/OsIndicationsSupported-$EFI_GLOBAL_VARIABLE/data"