diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2006-11-06 19:42:53 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2006-11-06 19:42:53 +0000 |
| commit | aaf091738af9d4112fb948ab66f51b0e4909905a (patch) | |
| tree | 3ade865de5b63ba49fc0d78e85927ea4a58a6ae9 /sys | |
| parent | cd76cad7a317f7d476d96a0d65b080b5e3f8c8d5 (diff) | |
Don't ask for root device if boot device is not known but root configuration
has been specified in the kernel configuration file.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/arch/landisk/landisk/autoconf.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/landisk/landisk/autoconf.c b/sys/arch/landisk/landisk/autoconf.c index d9dac0ac8bf..3f99c61e347 100644 --- a/sys/arch/landisk/landisk/autoconf.c +++ b/sys/arch/landisk/landisk/autoconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: autoconf.c,v 1.3 2006/11/06 19:05:31 miod Exp $ */ +/* $OpenBSD: autoconf.c,v 1.4 2006/11/06 19:42:52 miod Exp $ */ /* $NetBSD: autoconf.c,v 1.1 2006/09/01 21:26:18 uwe Exp $ */ /*- @@ -212,7 +212,7 @@ setroot() if (boothowto & RB_DFLTROOT) return; /* Boot compiled in */ - if (booted_device == NULL) { + if (booted_device == NULL && rootdev == NULL) { boothowto |= RB_ASKNAME; /* Don't Panic :-) */ /* boothowto |= RB_SINGLE; */ } |