diff options
| author | oster <oster@NetBSD.org> | 2002-07-13 17:04:09 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 2002-07-13 17:04:09 +0000 |
| commit | 73eaafcf062eb9489aaa3c345ba53b0d9d614827 (patch) | |
| tree | 372ec1850074759d751f8bb2daf1e6708a17b09a /sys/dev/raidframe | |
| parent | acb6f97235c24204670bcf0c017b88bc7d703477 (diff) | |
As suggested by MRG, if we have an autoconfig set for root, we should
set booted_device, even if RB_ASKNAME is set. That way the appropriate
device gets set as the default when it asks where you want to look for /.
Diffstat (limited to 'sys/dev/raidframe')
| -rw-r--r-- | sys/dev/raidframe/rf_netbsdkintf.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c index 169b8be1fff..dfd73985e79 100644 --- a/sys/dev/raidframe/rf_netbsdkintf.c +++ b/sys/dev/raidframe/rf_netbsdkintf.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_netbsdkintf.c,v 1.121 2002/06/27 05:13:33 leo Exp $ */ +/* $NetBSD: rf_netbsdkintf.c,v 1.122 2002/07/13 17:04:09 oster Exp $ */ /*- * Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc. * All rights reserved. @@ -114,7 +114,7 @@ ***********************************************************/ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.121 2002/06/27 05:13:33 leo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: rf_netbsdkintf.c,v 1.122 2002/07/13 17:04:09 oster Exp $"); #include <sys/param.h> #include <sys/errno.h> @@ -456,17 +456,14 @@ rf_buildroothack(arg) rf_cleanup_config_set(cset); cset = next_cset; } - if (boothowto & RB_ASKNAME) { - /* We don't auto-config... */ - } else { - /* They didn't ask, and we found something bootable... */ - if (num_root == 1) { - booted_device = &raidrootdev[rootID]; - } else if (num_root > 1) { - /* we can't guess.. require the user to answer... */ - boothowto |= RB_ASKNAME; - } + /* we found something bootable... */ + + if (num_root == 1) { + booted_device = &raidrootdev[rootID]; + } else if (num_root > 1) { + /* we can't guess.. require the user to answer... */ + boothowto |= RB_ASKNAME; } } |
