summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Kettenis <kettenis@cvs.openbsd.org>2006-10-29 18:28:08 +0000
committerMark Kettenis <kettenis@cvs.openbsd.org>2006-10-29 18:28:08 +0000
commitabc20087fbe9ac85d1111238432aa3179af49bbd (patch)
treee552d83d827b4e447850a1bdb071c6447b7c4b1b
parent02c385ff2c88f315a96ce7a1880957a0990d32f4 (diff)
The default for swap should be partition 'b' on the same unit as root is,
not partition 'b' on unit 0. ok deraadt@
-rw-r--r--sys/arch/amd64/amd64/autoconf.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/arch/amd64/amd64/autoconf.c b/sys/arch/amd64/amd64/autoconf.c
index 80829678ca1..29c177b81f3 100644
--- a/sys/arch/amd64/amd64/autoconf.c
+++ b/sys/arch/amd64/amd64/autoconf.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: autoconf.c,v 1.15 2006/10/17 19:39:07 deraadt Exp $ */
+/* $OpenBSD: autoconf.c,v 1.16 2006/10/29 18:28:07 kettenis Exp $ */
/* $NetBSD: autoconf.c,v 1.1 2003/04/26 18:39:26 fvdl Exp $ */
/*-
@@ -495,5 +495,5 @@ rootconf()
}
if (mountroot == dk_mountroot)
swdevt[0].sw_dev = argdev = dumpdev =
- makedev(major(rootdev), 1);
+ MAKEDISKDEV(major(rootdev), DISKUNIT(rootdev), 1);
}