summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-05-18 07:37:19 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-05-18 07:37:19 +0000
commitf82cd72f2127720569b53db747eed876eb80cbab (patch)
treee1e16fd7d1d4729a2976251dc3e16688fc566ab9
parent1ca986affa541f6e3a82aa45c66d572868e997bc (diff)
in case of pre-configured nfs, we must assume that the bootdv is the rootdv
-rw-r--r--sys/kern/subr_disk.c3
1 files changed, 2 insertions, 1 deletions
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) {