From 4abe01f2de3129da565d327402d7d88766ffb9bb Mon Sep 17 00:00:00 2001
From: Miod Vallat <miod@cvs.openbsd.org>
Date: Tue, 22 Feb 2005 22:11:46 +0000
Subject: Be sure to attach the console keyboard, if any, before prompting for
 an alternate root device if boot -a.

---
 sys/arch/hp300/hp300/autoconf.c | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'sys/arch')

diff --git a/sys/arch/hp300/hp300/autoconf.c b/sys/arch/hp300/hp300/autoconf.c
index e0736efee54..f458a94d798 100644
--- a/sys/arch/hp300/hp300/autoconf.c
+++ b/sys/arch/hp300/hp300/autoconf.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: autoconf.c,v 1.31 2005/01/16 17:43:04 millert Exp $	*/
+/*	$OpenBSD: autoconf.c,v 1.32 2005/02/22 22:11:45 miod Exp $	*/
 /*	$NetBSD: autoconf.c,v 1.45 1999/04/10 17:31:02 kleink Exp $	*/
 
 /*
@@ -165,6 +165,7 @@ ddlist_t	dev_data_list;	  	/* all dev_datas */
 ddlist_t	dev_data_list_hpib;	/* hpib controller dev_datas */
 ddlist_t	dev_data_list_scsi;	/* scsi controller dev_datas */
 
+void	diskconf(void);
 void	setroot(void);
 void	swapconf(void);
 void	findbootdev(void);
@@ -275,16 +276,23 @@ cpu_configure()
 		}
 	}
 
+	md_diskconf = diskconf;
+
+	cold = 0;
+}
+
+void
+diskconf()
+{
+
 	setroot();
 	swapconf();
 
 	/*
-	 * Set bootdev based on how we mounted root.
+	 * Set bootdev based on the device we booted from.
 	 * This is given to the boot program when we reboot.
 	 */
 	setbootdev();
-
-	cold = 0;
 }
 
 /**********************************************************************
-- 
cgit v1.2.3