move MI definition of rd into it's MI place also fixing

attributes, allowing kernels to exist w/ rd as the only disk device.
tested on a few archs; niels@ & millert@ ok

15 files changed, 14 insertions, 40 deletions

diff --git a/sys/arch/alpha/conf/files.alpha b/sys/arch/alpha/conf/files.alpha
index 454c60b4f80..d30dd321aed 100644
--- a/sys/arch/alpha/conf/files.alpha
+++ b/sys/arch/alpha/conf/files.alpha
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.alpha,v 1.29 1999/09/14 01:05:24 kstailey Exp $
+#	$OpenBSD: files.alpha,v 1.30 1999/11/08 15:36:07 mickey Exp $
 #	$NetBSD: files.alpha,v 1.32 1996/11/25 04:03:21 cgd Exp $
 #
 # alpha-specific configuration info
@@ -42,8 +42,6 @@ major { cd = 3 }
 major { sd = 8 }
 
 # RAM Disk
-pseudo-device rd
-file	dev/ramdisk.c			rd		needs-flag
 file	arch/alpha/alpha/rd_root.c	ramdisk_hooks
 major { rd = 6 }
 
diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index 1e5fc64df62..c89ddfeb2f4 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.amiga,v 1.33 1999/11/05 17:15:34 espie Exp $
+#	$OpenBSD: files.amiga,v 1.34 1999/11/08 15:36:07 mickey Exp $
 #	$NetBSD: files.amiga,v 1.62 1997/08/27 19:32:47 is Exp $
 
 
@@ -92,8 +92,6 @@ file	arch/amiga/dev/grf_cc.c		grfcc needs-flag
 file	arch/amiga/dev/ite_cc.c		grfcc & ite
 
 # RAM disk
-pseudo-device	rd
-file	dev/ramdisk.c			rd needs-flag
 file	arch/amiga/dev/rd_root.c	ramdisk_hooks
 
 pseudo-device	view
diff --git a/sys/arch/arc/conf/files.arc b/sys/arch/arc/conf/files.arc
index 8f58d22d594..3c6f9281852 100644
--- a/sys/arch/arc/conf/files.arc
+++ b/sys/arch/arc/conf/files.arc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.arc,v 1.21 1999/09/11 10:20:20 niklas Exp $
+#	$OpenBSD: files.arc,v 1.22 1999/11/08 15:36:07 mickey Exp $
 #
 # maxpartitions must be first item in files.${ARCH}
 #
@@ -153,8 +153,6 @@ file	arch/arc/isa/isapnp_machdep.c	isapnp
 # Specials.
 #
 # RAM disk for boot tape
-pseudo-device rd
-file dev/ramdisk.c			rd needs-flag
 file arch/arc/dev/rd_root.c		ramdisk_hooks
 major {rd = 8}
 
diff --git a/sys/arch/arm32/conf/files.arm32 b/sys/arch/arm32/conf/files.arm32
index 869f7688b8f..e2bd7bc9598 100644
--- a/sys/arch/arm32/conf/files.arm32
+++ b/sys/arch/arm32/conf/files.arm32
@@ -53,8 +53,6 @@ file    arch/arm32/mainbus/fd.c			fdc needs-flag
 major   {fd = 17}
 
 # RAM disk driver
-pseudo-device	rd
-file	dev/ramdisk.c				rd needs-count
 file	arch/arm32/dev/rd_hooks.c		rd | ramdisk_hooks
 major   {rd = 18}
 
diff --git a/sys/arch/hp300/conf/files.hp300 b/sys/arch/hp300/conf/files.hp300
index a2598ad276e..700b92d26e2 100644
--- a/sys/arch/hp300/conf/files.hp300
+++ b/sys/arch/hp300/conf/files.hp300
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hp300,v 1.11 1997/11/06 19:42:31 millert Exp $
+#	$OpenBSD: files.hp300,v 1.12 1999/11/08 15:36:08 mickey Exp $
 #	$NetBSD: files.hp300,v 1.28 1997/05/12 08:23:28 thorpej Exp $
 #
 # hp300-specific configuration info
@@ -165,8 +165,6 @@ attach	ppi at hpibbus
 file	arch/hp300/dev/ppi.c		ppi needs-flag
 
 # RAM disk
-pseudo-device rd
-file	dev/ramdisk.c			rd needs-flag
 file	arch/hp300/dev/rd_root.c	ramdisk_hooks
 major	{rd = 8}
 
diff --git a/sys/arch/hppa/conf/files.hppa b/sys/arch/hppa/conf/files.hppa
index fc0fbdaf99a..4276fb4ee3a 100644
--- a/sys/arch/hppa/conf/files.hppa
+++ b/sys/arch/hppa/conf/files.hppa
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.hppa,v 1.15 1999/08/18 00:26:28 mickey Exp $
+#	$OpenBSD: files.hppa,v 1.16 1999/11/08 15:36:08 mickey Exp $
 #
 # hppa-specific configuration info
 
@@ -107,8 +107,6 @@ major	{ccd = 1}
 major	{vnd = 2}
 
 # RAM disk
-pseudo-device rd: disk
-file	dev/ramdisk.c			rd needs-flag
 file	arch/hppa/dev/rd_root.c		ramdisk_hooks
 major	{rd = 3}
 
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 4c638d269b9..e561c290bf7 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.59 1999/10/26 13:14:35 downsj Exp $
+#	$OpenBSD: files.i386,v 1.60 1999/11/08 15:36:08 mickey Exp $
 #	$NetBSD: files.i386,v 1.73 1996/05/07 00:58:36 thorpej Exp $
 #
 # new style config file for i386 architecture
@@ -53,8 +53,6 @@ major	{st = 5}
 major	{cd = 6}
 
 # RAM Disk for install floppy
-pseudo-device rd
-file dev/ramdisk.c			rd needs-flag
 file arch/i386/i386/rd_root.c		ramdisk_hooks
 major	{rd = 17}
 
diff --git a/sys/arch/mac68k/conf/files.mac68k b/sys/arch/mac68k/conf/files.mac68k
index ebd5773be67..cfcc0094a1d 100644
--- a/sys/arch/mac68k/conf/files.mac68k
+++ b/sys/arch/mac68k/conf/files.mac68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mac68k,v 1.19 1998/05/08 22:17:04 gene Exp $
+#	$OpenBSD: files.mac68k,v 1.20 1999/11/08 15:36:08 mickey Exp $
 #	$NetBSD: files.mac68k,v 1.61 1997/03/01 20:22:16 scottr Exp $
 
 # mac68k-specific configuration info
@@ -129,8 +129,6 @@ file	dev/cons.c
 file	dev/cninit.c
 
 # RAM Disk for boot tape
-pseudo-device rd
-file dev/ramdisk.c			rd needs-flag
 file arch/sun3/dev/rd_root.c		ramdisk_hooks
 
 major	{sd = 4}
diff --git a/sys/arch/mvme68k/conf/files.mvme68k b/sys/arch/mvme68k/conf/files.mvme68k
index 47a586e084b..34b3f060e22 100644
--- a/sys/arch/mvme68k/conf/files.mvme68k
+++ b/sys/arch/mvme68k/conf/files.mvme68k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme68k,v 1.10 1999/08/17 22:47:14 mickey Exp $
+#	$OpenBSD: files.mvme68k,v 1.11 1999/11/08 15:36:09 mickey Exp $
 
 # config file for mvme68k
 
@@ -88,8 +88,6 @@ attach lptwo at pcctwo
 file	arch/mvme68k/dev/lptwo.c		lptwo needs-count
 
 # RAM disk for boot tape
-pseudo-device rd
-file dev/ramdisk.c				rd needs-flag
 file arch/mvme68k/dev/rd_root.c			ramdisk_hooks
 
 device vme { }
diff --git a/sys/arch/mvme88k/conf/files.mvme88k b/sys/arch/mvme88k/conf/files.mvme88k
index 000d8c11416..9f0ae280735 100644
--- a/sys/arch/mvme88k/conf/files.mvme88k
+++ b/sys/arch/mvme88k/conf/files.mvme88k
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.mvme88k,v 1.6 1999/09/27 21:21:16 smurph Exp $
+#	$OpenBSD: files.mvme88k,v 1.7 1999/11/08 15:36:10 mickey Exp $
 #	
 maxpartitions 16
 
@@ -79,8 +79,6 @@ file	arch/mvme88k/dev/vmes.c			vmes needs-count
 file	arch/mvme88k/dev/vmel.c			vmel needs-count
 
 #ramdisk support
-pseudo-device rd
-file 	dev/ramdisk.c					rd needs-flag
 file 	arch/mvme88k/dev/rd_root.c			ramdisk_hooks
 
 # list of standard files
diff --git a/sys/arch/pmax/conf/files.pmax b/sys/arch/pmax/conf/files.pmax
index e424821c1c3..219bbe47d6b 100644
--- a/sys/arch/pmax/conf/files.pmax
+++ b/sys/arch/pmax/conf/files.pmax
@@ -65,8 +65,6 @@ major { tz = 10 }
 major { rz = 21 }
 
 # RAM Disk for install floppy
-pseudo-device rd
-file	dev/ramdisk.c			rd needs-flag
 file	arch/pmax/pmax/rd_root.c	ramdisk_hooks
 major { rd = 25 }
 
diff --git a/sys/arch/powerpc/conf/files.powerpc b/sys/arch/powerpc/conf/files.powerpc
index 51146ccbae0..2cfb08674ca 100644
--- a/sys/arch/powerpc/conf/files.powerpc
+++ b/sys/arch/powerpc/conf/files.powerpc
@@ -59,8 +59,6 @@ file	arch/powerpc/powerpc/opendev.c ofcons | ofnet | ofdisk | ofrtc
 major	{ ofdisk = 4 }
 
 pseudo-device rd
-file dev/ramdisk.c			rd needs-flag
-file arch/powerpc/powerpc/rd_root.c	ramdisk_hooks
 major   {rd = 17}
 
 include	"../../../dev/pci/files.pci"
diff --git a/sys/arch/sparc/conf/files.sparc b/sys/arch/sparc/conf/files.sparc
index 1e95bbe5c66..017626c044d 100644
--- a/sys/arch/sparc/conf/files.sparc
+++ b/sys/arch/sparc/conf/files.sparc
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sparc,v 1.34 1999/09/07 02:58:49 jason Exp $
+#	$OpenBSD: files.sparc,v 1.35 1999/11/08 15:36:10 mickey Exp $
 #	$NetBSD: files.sparc,v 1.44 1997/08/31 21:29:16 pk Exp $
 
 # @(#)files.sparc	8.1 (Berkeley) 7/19/93
@@ -92,8 +92,6 @@ major { vnd = 8 }
 major { cd = 18 }
 
 # RAM Disk for install floppy
-pseudo-device rd
-file dev/ramdisk.c			rd needs-flag
 file arch/sparc/sparc/rd_root.c		ramdisk_hooks
 major	{rd = 17}
 
diff --git a/sys/arch/sun3/conf/files.sun3 b/sys/arch/sun3/conf/files.sun3
index e3938ded039..326d851be01 100644
--- a/sys/arch/sun3/conf/files.sun3
+++ b/sys/arch/sun3/conf/files.sun3
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.sun3,v 1.12 1999/08/17 22:47:15 mickey Exp $
+#	$OpenBSD: files.sun3,v 1.13 1999/11/08 15:36:11 mickey Exp $
 #	$NetBSD: files.sun3,v 1.26 1996/10/29 19:58:14 gwr Exp $
 
 #
@@ -178,8 +178,6 @@ file arch/sun3/dev/ms.c			ms needs-flag
 
 
 # RAM Disk for boot tape
-pseudo-device rd
-file dev/ramdisk.c			rd needs-flag
 file arch/sun3/dev/rd_root.c		ramdisk_hooks
 
 # Major numbers for root/swap device configuration
diff --git a/sys/conf/files b/sys/conf/files
index 22eaf34a850..3c5a807a969 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$OpenBSD: files,v 1.133 1999/10/29 05:23:47 angelos Exp $
+#	$OpenBSD: files,v 1.134 1999/11/08 15:36:01 mickey Exp $
 #	$NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
@@ -169,6 +169,8 @@ file	dev/usb/ohci.c			ohci	needs-flag
 pseudo-device vnd: disk
 pseudo-device ccd: disk
 pseudo-device raid: disk
+pseudo-device rd: disk
+file	dev/ramdisk.c			rd needs-flag
 
 pseudo-device pty: tty
 pseudo-device tb: tty