From 05fbfee3df2615285d136f732915dad9bb2695ca Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 13 Apr 2015 08:41:38 -0400
Subject: reduce timeout when using BOOT_AUTOMATIC_METHOD

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

(limited to 'images')

diff --git a/images/NEWS b/images/NEWS
index 61e8e3325..f623206e4 100644
--- a/images/NEWS
+++ b/images/NEWS
@@ -1,4 +1,5 @@
 - honor BOOT_AUTOMATIC_METHOD env var for UEFI too
+- reduce timeout when using BOOT_AUTOMATIC_METHOD env var
 
 Version 2.21 - 7 April 2015 by Thomas Backlund
 
diff --git a/images/make_boot_img b/images/make_boot_img
index 8588850bd..e9544d8f6 100755
--- a/images/make_boot_img
+++ b/images/make_boot_img
@@ -13,7 +13,7 @@ my $default_append = '';
 my $default_acpi = '';
 my $default_vga = "vga=788 splash quiet";
 my $default_iswmd = "noiswmd";
-my $timeout = 150;
+my $timeout = $ENV{BOOT_AUTOMATIC_METHOD} ? 5 : 150;
 my $lib = $arch eq 'x86_64' ? 'lib64' : 'lib';
 my $isolinux_bin = '/usr/lib/syslinux/isolinux.bin';
 
@@ -359,6 +359,7 @@ sub boot_iso {
        _ "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";
+           _ "sed -i 's#timeout=[0-9]*#timeout=1#' .boot_iso/EFI/BOOT/grub.cfg";
        }
        # add theme
        _ "cp -r /boot/grub2/{fonts,themes} .boot_iso/EFI/BOOT/";
-- 
cgit v1.2.1