]> xenbits.xensource.com Git - people/royger/osstest.git/commitdiff
osstest: remove the loader timeout from the install image
authorRoger Pau Monne <roger.pau@citrix.com>
Tue, 13 Feb 2018 12:40:30 +0000 (12:40 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Thu, 21 Jun 2018 15:56:55 +0000 (16:56 +0100)
When the FreeBSD installer is booted on the godello{0/1} boxes it
receives spurious key strokes. This doesn't happen so far when booted
from disk, or with any other boxes.

In order to cope with this remove the loader timeout on the install
image. Note that failure to boot will still drop the loader into a
manual prompt.

Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
ts-freebsd-build

index 54cb5902eb080a0469e13576e33d5abf371a77cd..5e7e10788697225c6d2f39259f8ff5e4003e4a96 100755 (executable)
@@ -135,7 +135,7 @@ chmod 0600 etc/ssh/ssh_host_*_key
 chmod 0644 etc/ssh/ssh_host_*_key.pub
 
 # Setup serial console output for stage1
-printf "%s" "-h -S$bauds" >> boot.config
+printf "%s" "-hn -S$bauds" >> boot.config
 cat << ENDBOOT >> boot/loader.conf
 # Serial console configuration
 boot_serial="YES"
@@ -143,6 +143,7 @@ comconsole_speed="$bauds"
 console="comconsole"
 boot_verbose="YES"
 beastie_disable="YES"
+autoboot_delay="-1"
 
 # mfs boot parameters
 mfs_load="YES"