summaryrefslogtreecommitdiff
path: root/sys/arch/mvme68k
diff options
context:
space:
mode:
authorMiod Vallat <miod@cvs.openbsd.org>2004-05-04 15:27:21 +0000
committerMiod Vallat <miod@cvs.openbsd.org>2004-05-04 15:27:21 +0000
commitf427f5f85203e3718fbe4abf0a556fb92d41627d (patch)
tree743d02a0a843c70aa35ad71e1c11797205691083 /sys/arch/mvme68k
parentd55c0619f9533edabdcf46aa20083a37a7a5275b (diff)
Always ask the user for the root device if we are "swap generic" and the
boot device is not known, as other arches do.
Diffstat (limited to 'sys/arch/mvme68k')
-rw-r--r--sys/arch/mvme68k/mvme68k/autoconf.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/arch/mvme68k/mvme68k/autoconf.c b/sys/arch/mvme68k/mvme68k/autoconf.c
index 29bfac97d81..3558d1bdcee 100644
--- a/sys/arch/mvme68k/mvme68k/autoconf.c
+++ b/sys/arch/mvme68k/mvme68k/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.24 2004/01/14 20:50:48 miod Exp $ */
+/* $OpenBSD: autoconf.c,v 1.25 2004/05/04 15:27:19 miod Exp $ */
/*
* Copyright (c) 1995 Theo de Raadt
@@ -387,6 +387,13 @@ setroot()
printf("boot device: %s\n",
(bootdv) ? bootdv->dv_xname : "<unknown>");
+ /*
+ * If 'swap generic' and we could not determine the boot device,
+ * ask the user.
+ */
+ if (mountroot == NULL && bootdv == NULL)
+ boothowto |= RB_ASKNAME;
+
if (boothowto & RB_ASKNAME) {
for (;;) {
printf("root device ");