diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2004-05-04 15:27:21 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2004-05-04 15:27:21 +0000 |
| commit | f427f5f85203e3718fbe4abf0a556fb92d41627d (patch) | |
| tree | 743d02a0a843c70aa35ad71e1c11797205691083 /sys | |
| parent | d55c0619f9533edabdcf46aa20083a37a7a5275b (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')
| -rw-r--r-- | sys/arch/luna88k/luna88k/autoconf.c | 9 | ||||
| -rw-r--r-- | sys/arch/luna88k/luna88k/machdep.c | 4 | ||||
| -rw-r--r-- | sys/arch/mvme68k/mvme68k/autoconf.c | 9 | ||||
| -rw-r--r-- | sys/arch/mvme88k/mvme88k/autoconf.c | 9 |
4 files changed, 26 insertions, 5 deletions
diff --git a/sys/arch/luna88k/luna88k/autoconf.c b/sys/arch/luna88k/luna88k/autoconf.c index 39e645d0596..dbfad82d0eb 100644 --- a/sys/arch/luna88k/luna88k/autoconf.c +++ b/sys/arch/luna88k/luna88k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.1 2004/04/21 15:23:58 aoyama Exp $ */ +/* $OpenBSD: autoconf.c,v 1.2 2004/05/04 15:27:15 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -234,6 +234,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 "); diff --git a/sys/arch/luna88k/luna88k/machdep.c b/sys/arch/luna88k/luna88k/machdep.c index 677d1f15a1b..cc8b27db383 100644 --- a/sys/arch/luna88k/luna88k/machdep.c +++ b/sys/arch/luna88k/luna88k/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.1 2004/04/21 15:24:08 aoyama Exp $ */ +/* $OpenBSD: machdep.c,v 1.2 2004/05/04 15:27:15 miod Exp $ */ /* * Copyright (c) 1998, 1999, 2000, 2001 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -203,7 +203,7 @@ extern char *esym; int machtype = LUNA_88K2; /* XXX: aoyama */ int cputyp = CPU_88100; /* XXX: aoyama */ -int boothowto = RB_ASKNAME; /* XXX: should be set in boot loader and locore.S */ +int boothowto; /* XXX: should be set in boot loader and locore.S */ int bootdev; /* XXX: should be set in boot loader and locore.S */ int cpuspeed; double cycles_per_microsecond; /* used in locore.S:delay() */ 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 "); diff --git a/sys/arch/mvme88k/mvme88k/autoconf.c b/sys/arch/mvme88k/mvme88k/autoconf.c index cbb6b84c7de..afa4ebbbeeb 100644 --- a/sys/arch/mvme88k/mvme88k/autoconf.c +++ b/sys/arch/mvme88k/mvme88k/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.27 2004/04/24 19:51:49 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.28 2004/05/04 15:27:20 miod Exp $ */ /* * Copyright (c) 1998 Steve Murphree, Jr. * Copyright (c) 1996 Nivas Madhur @@ -235,6 +235,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 "); |