summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2011-11-08 19:22:14 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2011-11-08 19:22:14 +0000
commit8edfb9c0b517e4fdc82028943291a5c0d5f63bdd (patch)
treee6acb085ecd08afaf61d4bc926ad38a0ea112abb
parentf6d89a834c1e6236fb93895cee27d0cf85c6460f (diff)
consistant "config bsd" lines; ok miod
-rw-r--r--sys/arch/hp300/conf/RAMDISK4
-rw-r--r--sys/arch/luna88k/conf/RAMDISK4
-rw-r--r--sys/arch/mac68k/conf/RAMDISK4
-rw-r--r--sys/arch/mvme68k/conf/RAMDISK4
-rw-r--r--sys/arch/mvme88k/conf/RAMDISK4
-rw-r--r--sys/arch/zaurus/conf/GENERIC3
6 files changed, 10 insertions, 13 deletions
diff --git a/sys/arch/hp300/conf/RAMDISK b/sys/arch/hp300/conf/RAMDISK
index 0ac74762df0..25cc529b7ae 100644
--- a/sys/arch/hp300/conf/RAMDISK
+++ b/sys/arch/hp300/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.33 2011/08/18 20:03:38 miod Exp $
+# $OpenBSD: RAMDISK,v 1.34 2011/11/08 19:22:13 deraadt Exp $
#
# Ram disk kernel.
#
@@ -50,7 +50,7 @@ option DIOVERBOSE # recognize "unknown" DIO devices
option MINIROOTSIZE=4096
option RAMDISK_HOOKS
-config bsd root on rd0 swap on rd0 and hd0b and sd0b
+config bsd root on rd0a swap on rd0b and hd0b and sd0b
mainbus0 at root # root "bus"
diff --git a/sys/arch/luna88k/conf/RAMDISK b/sys/arch/luna88k/conf/RAMDISK
index 28756370ddd..09c422ae875 100644
--- a/sys/arch/luna88k/conf/RAMDISK
+++ b/sys/arch/luna88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.10 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.11 2011/11/08 19:22:13 deraadt Exp $
machine luna88k m88k
@@ -17,7 +17,7 @@ option ERRATA__XXX_USR
maxusers 32
-config bsd root rd0 swap on rd0b
+config bsd root rd0a swap on rd0b
option SCSITERSE
option SMALL_KERNEL
diff --git a/sys/arch/mac68k/conf/RAMDISK b/sys/arch/mac68k/conf/RAMDISK
index 704a29355df..441dcae0314 100644
--- a/sys/arch/mac68k/conf/RAMDISK
+++ b/sys/arch/mac68k/conf/RAMDISK
@@ -1,6 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.24 2011/06/29 20:52:09 matthew Exp $
-#
-# RAMDISK - bsd.rd configuration file (non-SBC version)
+# $OpenBSD: RAMDISK,v 1.25 2011/11/08 19:22:13 deraadt Exp $
machine mac68k m68k
diff --git a/sys/arch/mvme68k/conf/RAMDISK b/sys/arch/mvme68k/conf/RAMDISK
index 62fa8878c48..749fc4d2ffd 100644
--- a/sys/arch/mvme68k/conf/RAMDISK
+++ b/sys/arch/mvme68k/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.15 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.16 2011/11/08 19:22:13 deraadt Exp $
machine mvme68k m68k
@@ -35,7 +35,7 @@ option INET # IP + ICMP + TCP + UDP
option INET6
option BOOT_CONFIG # boot-time kernel config
-config bsd root rd0 swap on rd0b
+config bsd root rd0a swap on rd0b
mainbus0 at root
diff --git a/sys/arch/mvme88k/conf/RAMDISK b/sys/arch/mvme88k/conf/RAMDISK
index b9bcd2917a7..2b7799b50e5 100644
--- a/sys/arch/mvme88k/conf/RAMDISK
+++ b/sys/arch/mvme88k/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.33 2011/06/29 20:52:09 matthew Exp $
+# $OpenBSD: RAMDISK,v 1.34 2011/11/08 19:22:13 deraadt Exp $
machine mvme88k m88k
@@ -31,7 +31,7 @@ option INET
option INET6
option BOOT_CONFIG
-config bsd root rd0 swap on rd0b
+config bsd root rd0a swap on rd0b
mainbus0 at root
diff --git a/sys/arch/zaurus/conf/GENERIC b/sys/arch/zaurus/conf/GENERIC
index d2cb1082356..61a3ffd1e70 100644
--- a/sys/arch/zaurus/conf/GENERIC
+++ b/sys/arch/zaurus/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.86 2011/09/20 22:11:42 miod Exp $
+# $OpenBSD: GENERIC,v 1.87 2011/11/08 19:22:13 deraadt Exp $
#
# For further information on compiling OpenBSD kernels, see the config(8)
# man page.
@@ -33,7 +33,6 @@ option WSDISPLAY_COMPAT_PCVT # emulate some ioctls; needed for X11
option USBVERBOSE
config bsd swap generic
-#config bsd root on wd0a
# The main bus device
mainbus0 at root