From f82cd72f2127720569b53db747eed876eb80cbab Mon Sep 17 00:00:00 2001
From: Theo de Raadt <deraadt@cvs.openbsd.org>
Date: Fri, 18 May 2007 07:37:19 +0000
Subject: in case of pre-configured nfs, we must assume that the bootdv is the
 rootdv

---
 sys/kern/subr_disk.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'sys/kern/subr_disk.c')

diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 803f80aea9c..bf6a4c32e04 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_disk.c,v 1.40 2007/05/15 01:58:06 deraadt Exp $	*/
+/*	$OpenBSD: subr_disk.c,v 1.41 2007/05/18 07:37:18 deraadt Exp $	*/
 /*	$NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $	*/
 
 /*
@@ -700,6 +700,7 @@ gotswap:
 		swdevt[1].sw_dev = NODEV;
 #if defined(NFSCLIENT)
 	} else if (mountroot == nfs_mountroot) {
+		rootdv = bootdv;
 		rootdev = dumpdev = swapdev = NODEV;
 #endif
 	} else if (mountroot == NULL) {
-- 
cgit v1.2.3