From 73eaafcf062eb9489aaa3c345ba53b0d9d614827 Mon Sep 17 00:00:00 2001
From: oster <oster@NetBSD.org>
Date: Sat, 13 Jul 2002 17:04:09 +0000
Subject: [PATCH] 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 /.

---
 sys/dev/raidframe/rf_netbsdkintf.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/sys/dev/raidframe/rf_netbsdkintf.c b/sys/dev/raidframe/rf_netbsdkintf.c
index 169b8be1fff3..dfd73985e79b 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;
 	}
 }