diff options
| author | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-04-17 09:49:49 +0000 |
|---|---|---|
| committer | Mark Kettenis <kettenis@cvs.openbsd.org> | 2011-04-17 09:49:49 +0000 |
| commit | c7a9be41271a39b56a2bfc7b59a56ea219493c15 (patch) | |
| tree | f69cb716b0cfe9819276a445a84635c1059da901 /sys/stand | |
| parent | 5fad7c39771140396fbfb26a014788a1f20bb294 (diff) | |
Tweak the behaviour of boot(8) on hppa. Normal boots now will give you a
chance to interrupt the boot procedure before booting the default kernel,
just like (most) of our other hardware platforms. Interactive boots, where
you interrupt the firmware boot procedure and answer "Y" to the
"Interact with IPL?" question will now wait for human intervention at the
boot> prompt (without a timeout). Should reduce frustration when trying to
boot an alternative kernel.
ok deraadt@, miod@, jsing@, todd@
Diffstat (limited to 'sys/stand')
| -rw-r--r-- | sys/stand/boot/boot.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sys/stand/boot/boot.c b/sys/stand/boot/boot.c index 66feece8afd..4f64c52298f 100644 --- a/sys/stand/boot/boot.c +++ b/sys/stand/boot/boot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: boot.c,v 1.36 2007/06/26 10:34:41 tom Exp $ */ +/* $OpenBSD: boot.c,v 1.37 2011/04/17 09:49:48 kettenis Exp $ */ /* * Copyright (c) 2003 Dale Rahn @@ -50,6 +50,7 @@ struct cmd_state cmd; /* bootprompt can be set by MD code to avoid prompt first time round */ int bootprompt = 1; char *kernelfile = KERNEL; /* can be changed by MD code */ +int boottimeout = 5; /* can be changed by MD code */ void boot(dev_t bootdev) @@ -69,7 +70,7 @@ boot(dev_t bootdev) cmd.boothowto = 0; cmd.conf = "/etc/boot.conf"; cmd.addr = (void *)DEFAULT_KERNEL_ADDRESS; - cmd.timeout = 5; + cmd.timeout = boottimeout; st = read_conf(); if (!bootprompt) |