diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-04-13 08:41:38 -0400 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2015-04-13 17:46:15 +0200 |
| commit | 05fbfee3df2615285d136f732915dad9bb2695ca (patch) | |
| tree | eba260082cd6ab45a73390814ac9c2694f52c081 | |
| parent | b5bb5c8bc4a751c353a004df0adc50cc3d268db3 (diff) | |
| download | drakx-05fbfee3df2615285d136f732915dad9bb2695ca.tar drakx-05fbfee3df2615285d136f732915dad9bb2695ca.tar.gz drakx-05fbfee3df2615285d136f732915dad9bb2695ca.tar.bz2 drakx-05fbfee3df2615285d136f732915dad9bb2695ca.tar.xz drakx-05fbfee3df2615285d136f732915dad9bb2695ca.zip | |
reduce timeout when using BOOT_AUTOMATIC_METHOD
| -rw-r--r-- | images/NEWS | 1 | ||||
| -rwxr-xr-x | images/make_boot_img | 3 |
2 files changed, 3 insertions, 1 deletions
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/"; |