[src/trunk]: src/sys/dev/raidframe As suggested by MRG, if we have an autocon...

[oster <oster%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1083fbc6cfca
branches:  trunk
changeset: 534023:1083fbc6cfca
user:      oster <oster%NetBSD.org@localhost>
date:      Sat Jul 13 17:04:09 2002 +0000

description:
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:

 sys/dev/raidframe/rf_netbsdkintf.c |  23 ++++++++++-------------
 1 files changed, 10 insertions(+), 13 deletions(-)

diffs (44 lines):

diff -r eaff7e3dcb55 -r 1083fbc6cfca sys/dev/raidframe/rf_netbsdkintf.c
--- a/sys/dev/raidframe/rf_netbsdkintf.c        Sat Jul 13 16:53:44 2002 +0000
+++ b/sys/dev/raidframe/rf_netbsdkintf.c        Sat Jul 13 17:04:09 2002 +0000
@@ -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_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;
        }
 }