Merge pull request #313 from crawford/timeout

onmetal: Up the TIMEOUT and TOTALTIMEOUT settings
This commit is contained in:
Alex Crawford 2014-08-06 18:56:27 -07:00
commit 891c47819b

View File

@ -333,8 +333,13 @@ _run_box_fs_hook() {
_run_onmetal_fs_hook() {
# HACKITY HACK until OEMs can customize bootloader configs
local arg='8250.nr_uarts=5 console=ttyS4,115200n8 modprobe.blacklist=mei_me'
local timeout=150
local totaltimeout=1200
sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/boot_kernel.cfg" \
-e 's/console=[^ ]*//g' -e "s/\\(append.*$\\)/\\1 ${arg}/"
sudo sed -i "${VM_TMP_ROOT}/boot/efi/syslinux/syslinux.cfg" \
-e "s/^TIMEOUT [0-9]*/TIMEOUT ${timeout}/g" \
-e "s/^TOTALTIMEOUT [0-9]*/TOTALTIMEOUT ${totaltimeout}/g"
}
# Write the vm disk image to the target directory in the proper format