From b5bb5c8bc4a751c353a004df0adc50cc3d268db3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 13 Apr 2015 08:40:12 -0400
Subject: honor BOOT_AUTOMATIC_METHOD env var for UEFI too

---
 images/NEWS          | 2 ++
 images/make_boot_img | 3 +++
 2 files changed, 5 insertions(+)

(limited to 'images')

diff --git a/images/NEWS b/images/NEWS
index fcaefa268..61e8e3325 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,3 +1,5 @@
+- honor BOOT_AUTOMATIC_METHOD env var for UEFI too
+
 Version 2.21 - 7 April 2015 by Thomas Backlund
 
 - fix finding grub legacy files for hd_grub generation
diff --git a/images/make_boot_img b/images/make_boot_img
index 15ba799eb..8588850bd 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -357,6 +357,9 @@ sub boot_iso {
        my $efi_gfx     = "gfxmenu gfxterm efi_gop efi_uga video video_bochs video_cirrus video_fb font png";
        _ "/usr/bin/grub2-mkimage --prefix='/EFI/BOOT' -O x86_64-efi -o .boot_iso/EFI/BOOT/bootx64.efi $efi_core $efi_part_fs $efi_gfx";
        _ "cp -f grub2.config .boot_iso/EFI/BOOT/grub.cfg";
+       if ($ENV{BOOT_AUTOMATIC_METHOD}) {
+           _ "sed -i 's#\\(linux .*\\)#\\1 automatic=$ENV{BOOT_AUTOMATIC_METHOD}#' .boot_iso/EFI/BOOT/grub.cfg";
+       }
        # add theme
        _ "cp -r /boot/grub2/{fonts,themes} .boot_iso/EFI/BOOT/";
        _ "cp -f grub2.theme .boot_iso/EFI/BOOT/themes/maggy/theme.txt";
-- 
cgit v1.2.1