diff options
| author | Martin Reindl <martin@cvs.openbsd.org> | 2005-11-12 18:39:20 +0000 |
|---|---|---|
| committer | Martin Reindl <martin@cvs.openbsd.org> | 2005-11-12 18:39:20 +0000 |
| commit | 265ec8d34b3a61fe815e02324837e9a4111303a6 (patch) | |
| tree | 1737ac833809846546df3e9014026c6afb4b1b8f /sys/arch/alpha | |
| parent | ef16f722865afe110205987278d67af2ec273dee (diff) | |
no longer require boot_osflags being set to 'a' in the SRM for going multiuser; setting boot_osflags to 's' explicitly will get us to singleuser as usual; very old SRM versions can only set 'a' or 's', but are still fine because we ignore 'a' now and default to multiuser
idea and ok deraadt@, jsg@, testing by many
final ok miod@
Diffstat (limited to 'sys/arch/alpha')
| -rw-r--r-- | sys/arch/alpha/alpha/machdep.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/sys/arch/alpha/alpha/machdep.c b/sys/arch/alpha/alpha/machdep.c index c28f1538348..5db767b50d4 100644 --- a/sys/arch/alpha/alpha/machdep.c +++ b/sys/arch/alpha/alpha/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.93 2005/10/17 18:34:22 miod Exp $ */ +/* $OpenBSD: machdep.c,v 1.94 2005/11/12 18:39:19 martin Exp $ */ /* $NetBSD: machdep.c,v 1.210 2000/06/01 17:12:38 thorpej Exp $ */ /*- @@ -712,7 +712,6 @@ nobootinfo: * Look at arguments passed to us and compute boothowto. */ - boothowto = RB_SINGLE; #ifdef KADB boothowto |= RB_KDB; #endif @@ -723,9 +722,8 @@ nobootinfo: * says that we shouldn't. */ switch (*p) { - case 'a': /* autoboot */ + case 'a': /* Ignore */ case 'A': - boothowto &= ~RB_SINGLE; break; case 'b': /* Enter DDB as soon as the console is initialised */ @@ -762,7 +760,7 @@ nobootinfo: boothowto |= RB_ASKNAME; break; - case 's': /* single-user (default, supported for sanity) */ + case 's': /* single-user */ case 'S': boothowto |= RB_SINGLE; break; |