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 | |
| 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@
| -rw-r--r-- | distrib/notes/alpha/prep | 8 | ||||
| -rw-r--r-- | sys/arch/alpha/alpha/machdep.c | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/distrib/notes/alpha/prep b/distrib/notes/alpha/prep index 0cabd7a819c..af0f7ea5d4f 100644 --- a/distrib/notes/alpha/prep +++ b/distrib/notes/alpha/prep @@ -1,4 +1,4 @@ -dnl $OpenBSD: prep,v 1.23 2005/03/18 13:31:13 miod Exp $ +dnl $OpenBSD: prep,v 1.24 2005/11/12 18:39:19 martin Exp $ OpenBSD/MACHINE requires the SRM console. Some alphas come with the AlphaBIOS (also known as the ARC firmware on older machines) instead; this is what Windows NT uses. It is fairly simple to replace the AlphaBIOS @@ -59,16 +59,14 @@ Using the SRM console: console, in which case you need to always specify a kernel filename if it differs from "bsd". boot_osflags Flags to pass to the kernel. - IMPORTANT! For multiuser boot, this needs to be - set to "a". To see a list of all variables on your machine, use the "show" command with no arguments. You can bypass the boot_file and boot_osflags values from the command prompt, with the -fi (to override boot_file) and -fl (to override boot_osflags) options. For example, - boot -fi bsd -fl ac dka0 - will boot the "bsd" kernel with the "ac" flags on dka0. However, some + boot -fi bsd -fl c dka0 + will boot the "bsd" kernel with the "c" flag on dka0. However, some versions of the SRM console (mainly on DEC 3000 series) will only let you specify uppercase filenames. 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; |