Make the following changes to PicoBSD kernel configurations:

	- to account for recent changes in MFS:
		add pseudo-device md
		replace MFS_ROOT with MD_ROOT
	- replace deprecated "disk" with "device"

5 files changed, 34 insertions, 29 deletions

diff --git a/release/picobsd/dial/PICOBSD b/release/picobsd/dial/PICOBSD
index 7e3a301..edc4fb8 100644
--- a/release/picobsd/dial/PICOBSD
+++ b/release/picobsd/dial/PICOBSD
@@ -14,7 +14,7 @@ options		INET			#InterNETworking
 options		FFS			#Berkeley Fast Filesystem
 options		FFS_ROOT		#FFS usable as root device [keep this!]
 options		MFS			#Memory Filesystem
-options		MFS_ROOT		#Use MFS for root
+options		MD_ROOT			#Use MFS for root
 options		MSDOSFS			#MSDOS Filesystem
 options		CD9660			#ISO 9660 Filesystem
 options		EXT2FS
@@ -30,16 +30,16 @@ controller	isa0
 controller	pci0
 
 controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
-disk		fd0	at fdc0 drive 0
-disk		fd1	at fdc0 drive 1
+device		fd0	at fdc0 drive 0
+device		fd1	at fdc0 drive 1
 
 controller	wdc0	at isa? port IO_WD1 irq 14
-disk		wd0	at wdc0 drive 0
-disk		wd1	at wdc0 drive 1
+device		wd0	at wdc0 drive 0
+device		wd1	at wdc0 drive 1
 
 controller	wdc1	at isa? port IO_WD2 irq 15
-disk		wd2	at wdc1 drive 0
-disk		wd3	at wdc1 drive 1
+device		wd2	at wdc1 drive 0
+device		wd3	at wdc1 drive 1
 
 device		wcd0	#IDE CD-ROM
 
@@ -83,4 +83,5 @@ pseudo-device	loop
 pseudo-device	ether
 pseudo-device	tun	1
 pseudo-device	pty	16
+pseudo-device	md
 #pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/install/PICOBSD b/release/picobsd/install/PICOBSD
index a23ff51..ec99129 100644
--- a/release/picobsd/install/PICOBSD
+++ b/release/picobsd/install/PICOBSD
@@ -16,7 +16,7 @@ options		FFS			#Berkeley Fast Filesystem
 options		FFS_ROOT
 # options		NFS			#Network Filesystem
 options		MFS
-options		MFS_ROOT
+options		MD_ROOT
 options		MSDOSFS			#MSDOS Filesystem
 # options		"EXT2FS"
 options		"COMPAT_43"		#Compatible with BSD 4.3 [KEEP THIS!]
@@ -28,17 +28,17 @@ controller	isa0
 controller	pci0
 
 controller	fdc0	at isa? port "IO_FD1" bio irq 6 drq 2
-disk		fd0	at fdc0 drive 0
-#disk		fd1	at fdc0 drive 1
+device		fd0	at fdc0 drive 0
+#device		fd1	at fdc0 drive 1
 
 options		"CMD640"	# work around CMD640 chip deficiency
 controller	wdc0	at isa? port "IO_WD1" bio irq 14 flags 0xb0ffb0ff
-disk		wd0	at wdc0 drive 0
-disk		wd1	at wdc0 drive 1
+device		wd0	at wdc0 drive 0
+device		wd1	at wdc0 drive 1
 
 controller	wdc1	at isa? port "IO_WD2" bio irq 15 flags 0xb0ffb0ff
-disk		wd2	at wdc1 drive 0
-disk		wd3	at wdc1 drive 1
+device		wd2	at wdc1 drive 0
+device		wd3	at wdc1 drive 1
 
 #options		ATAPI		#Enable ATAPI support for IDE bus
 #options		ATAPI_STATIC	#Don't do it as an LKM
@@ -83,5 +83,6 @@ pseudo-device	ether
 # pseudo-device	tun	2
 pseudo-device	vn
 pseudo-device	pty	16
+pseudo-device	md
 #pseudo-device	gzip		# Exec gzipped a.out's
 pseudo-device	bpfilter	4
diff --git a/release/picobsd/isp/PICOBSD b/release/picobsd/isp/PICOBSD
index cacc5e9..b947db2 100644
--- a/release/picobsd/isp/PICOBSD
+++ b/release/picobsd/isp/PICOBSD
@@ -17,7 +17,7 @@ options		FFS_ROOT		#FFS usable as root device [keep this!]
 options		NFS			#Network Filesystem
 #options		BOOTP
 options		MFS			#Memory Filesystem
-options		MFS_ROOT		#MFS as root
+options		MD_ROOT			#MFS as root
 options		MSDOSFS			#MSDOS Filesystem
 options		CD9660			#ISO 9660 Filesystem
 options		PROCFS			#Process filesystem
@@ -38,16 +38,16 @@ controller	isa0
 controller	pci0
 
 controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
-disk		fd0	at fdc0 drive 0
-#disk		fd1	at fdc0 drive 1
+device		fd0	at fdc0 drive 0
+#device		fd1	at fdc0 drive 1
 
 controller	wdc0	at isa? port IO_WD1 irq 14
-disk		wd0	at wdc0 drive 0
-disk		wd1	at wdc0 drive 1
+device		wd0	at wdc0 drive 0
+device		wd1	at wdc0 drive 1
 
 controller	wdc1	at isa? port IO_WD2 irq 15
-disk		wd2	at wdc1 drive 0
-disk		wd3	at wdc1 drive 1
+device		wd2	at wdc1 drive 0
+device		wd3	at wdc1 drive 1
 
 device		wcd0	#IDE CD-ROM
 
@@ -132,4 +132,5 @@ pseudo-device	ppp	8
 pseudo-device	tun	2
 #pseudo-device	vn
 pseudo-device	pty	16
+pseudo-device	md
 #pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/net/PICOBSD b/release/picobsd/net/PICOBSD
index 3deedde..b5f923f 100644
--- a/release/picobsd/net/PICOBSD
+++ b/release/picobsd/net/PICOBSD
@@ -16,7 +16,7 @@ options		FFS			#Berkeley Fast Filesystem
 options		FFS_ROOT		#FFS usable as root device [keep this!]
 options		NFS			#Network Filesystem
 options		MFS			#Memory Filesystem
-options		MFS_ROOT		#MFS as root
+options		MD_ROOT			#MFS as root
 options		MSDOSFS			#MSDOS Filesystem
 options		CD9660			#ISO 9660 Filesystem
 options		COMPAT_43		#Compatible with BSD 4.3 [KEEP THIS!]
@@ -36,16 +36,16 @@ controller	isa0
 controller	pci0
 
 controller	fdc0	at isa? port IO_FD1 irq 6 drq 2
-disk		fd0	at fdc0 drive 0
-#disk		fd1	at fdc0 drive 1
+device		fd0	at fdc0 drive 0
+#device		fd1	at fdc0 drive 1
 
 controller	wdc0	at isa? port IO_WD1 irq 14
-disk		wd0	at wdc0 drive 0
-disk		wd1	at wdc0 drive 1
+device		wd0	at wdc0 drive 0
+device		wd1	at wdc0 drive 1
 
 controller	wdc1	at isa? port IO_WD2 irq 15
-disk		wd2	at wdc1 drive 0
-disk		wd3	at wdc1 drive 1
+device		wd2	at wdc1 drive 0
+device		wd3	at wdc1 drive 1
 
 device		wcd0	#IDE CD-ROM
 
@@ -94,4 +94,5 @@ pseudo-device	ether
 pseudo-device	tun	2
 #pseudo-device	vn
 pseudo-device	pty	16
+pseudo-device	md
 #pseudo-device	gzip		# Exec gzipped a.out's
diff --git a/release/picobsd/router/PICOBSD b/release/picobsd/router/PICOBSD
index fabfcfa..40f6a56 100644
--- a/release/picobsd/router/PICOBSD
+++ b/release/picobsd/router/PICOBSD
@@ -16,7 +16,7 @@ options		FFS			#Berkeley Fast Filesystem
 options		FFS_ROOT		#FFS usable as root device [keep this!]
 #options		NFS			#Network Filesystem
 options		MFS			#Memory Filesystem
-options		MFS_ROOT		#MFS as root
+options		MD_ROOT			#MFS as root
 #options		MSDOSFS			#MSDOS Filesystem
 #options		CD9660			#ISO 9660 Filesystem
 #options		PROCFS			#Process filesystem
@@ -98,4 +98,5 @@ pseudo-device	ether
 #pseudo-device bpf	4
 pseudo-device ppp 	4
 pseudo-device	pty	16
+pseudo-device	md
 #pseudo-device	gzip		# Exec gzipped a.out's