The disktab attribute 'ty' was used to set D_REMOVEABLE and D_RAMDISK

flags in the disklabel. These flags were discarded in 2006.

Remove documentation for and instances of 'ty'. Add instances of
'dt' that were missing. Use 'floppy' as the value of 'dt' for all
floppies and 'rdroot' for all boot images/miniroots.

Add 'rdroot' to dktypenames and an associated #define DTYPE_RDROOT,
since 'dt' values are parsed by matching entries in dktypenames[].

Slightly tweaked part of larger cleanup diff previously ok deraadt@.

20 files changed, 80 insertions, 80 deletions

diff --git a/etc/etc.alpha/disktab b/etc/etc.alpha/disktab
index e9c865532cb..40c3fefcf0c 100644
--- a/etc/etc.alpha/disktab
+++ b/etc/etc.alpha/disktab
@@ -1,12 +1,12 @@
-#	$OpenBSD: disktab,v 1.21 2015/08/13 18:02:56 krw Exp $
+#	$OpenBSD: disktab,v 1.22 2015/08/14 23:45:55 krw Exp $
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
 rdroot:\
-	:ty=ramdisk:se#512:nt#2:rm#300:ns#8:nc#359:\
+	:dt=rdroot:se#512:nt#2:rm#300:ns#8:nc#359:\
 	:pa#5744:oa#0:ta=4.2BSD:ba#8192:fa#1024: \
 	:pc#5744:oc#0:
diff --git a/etc/etc.amd64/disktab b/etc/etc.amd64/disktab
index 8dded422a9f..0d3ffb5ae02 100644
--- a/etc/etc.amd64/disktab
+++ b/etc/etc.amd64/disktab
@@ -1,35 +1,35 @@
-#	$OpenBSD: disktab,v 1.16 2015/08/13 18:02:57 krw Exp $
+#	$OpenBSD: disktab,v 1.17 2015/08/14 23:45:55 krw Exp $
 
 mini34|gzip bsd.rd disk image 3.40625MB:\
-	:ty=SCSI:se#512:nt#1:ns#64:nc#109:\
+	:dt=rdroot:se#512:nt#1:ns#64:nc#109:\
 	:pa#6912:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#6976:oc#0:
 
 install280|install.fs disk image 280MB:\
-	:ty=SCSI:se#512:nt#1:ns#64:nc#8960:\
+	:dt=rdroot:se#512:nt#1:ns#64:nc#8960:\
 	:pa#573376:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#573440:oc#0:
 
 floppy576|3in|3.5in High Density Floppy, 5.76MB:\
-	:dt=floppy:ty=floppy:se#512:nt#2:ns#36:nc#160:\
+	:dt=floppy:se#512:nt#2:ns#36:nc#160:\
 	:pa#11520:oa#0:ba#4096:fa#512:ta=4.2BSD: \
 	:pb#11520:ob#0:\
 	:pc#11520:oc#0:
 
 floppy288|3in|3.5in High Density Floppy, 2.88MB:\
-	:dt=floppy:ty=floppy:se#512:nt#2:ns#36:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#36:nc#80:\
 	:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD: \
 	:pb#5760:ob#0:\
 	:pc#5760:oc#0:
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=ramdisk:se#512:nt#2:ns#140:nc#16:\
+	:dt=rdroot:se#512:nt#2:ns#140:nc#16:\
 	:pa#4480:oa#0:ta=4.2BSD:ba#4096:fa#512:\
 	:pb#0:ob#0:tb=swap:\
 	:pc#4480:oc#0:
diff --git a/etc/etc.armish/disktab b/etc/etc.armish/disktab
index eec6172cd6b..6a9eb6bf1dd 100644
--- a/etc/etc.armish/disktab
+++ b/etc/etc.armish/disktab
@@ -1,25 +1,25 @@
-# $OpenBSD: disktab,v 1.3 2015/08/13 18:02:57 krw Exp $
+# $OpenBSD: disktab,v 1.4 2015/08/14 23:45:55 krw Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#256:\
 	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#8192:
 
 
 rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#160:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#160:\
 	:oa#0:pa#5120:ta=4.2BSD:fa#512:ba#4096:\
 	:ob#0:pb#0:tb=swap:\
 	:oc#0:pc#5120:
 
 # pseudo-geometry taken from rd794
 miniroot:\
-	:ty=winchester:ns#16:nt#7:nc#968:\
+	:dt=rdroot:ns#16:nt#7:nc#968:\
 	:pa#10240:ba#8192:fa#1024:
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
diff --git a/etc/etc.armv7/disktab b/etc/etc.armv7/disktab
index 54bd18b4199..0da76a28c44 100644
--- a/etc/etc.armv7/disktab
+++ b/etc/etc.armv7/disktab
@@ -1,25 +1,25 @@
-# $OpenBSD: disktab,v 1.3 2015/08/13 18:02:57 krw Exp $
+# $OpenBSD: disktab,v 1.4 2015/08/14 23:45:55 krw Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#320:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#320:\
 	:ta=4.2BSD:oa#0:pa#10240:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#10240:
 
 
 rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#160:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#160:\
 	:oa#0:pa#5120:ta=4.2BSD:fa#512:ba#4096:\
 	:ob#0:pb#0:tb=swap:\
 	:oc#0:pc#5120:
 
 # pseudo-geometry taken from rd794
 miniroot:\
-	:ty=winchester:ns#16:nt#7:nc#968:\
+	:dt=rdroot:ns#16:nt#7:nc#968:\
 	:pa#10240:ba#8192:fa#1024:
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
diff --git a/etc/etc.aviion/disktab b/etc/etc.aviion/disktab
index 95763be47c1..9b11f6b51f4 100644
--- a/etc/etc.aviion/disktab
+++ b/etc/etc.aviion/disktab
@@ -1,6 +1,6 @@
-#	$OpenBSD: disktab,v 1.3 2013/10/15 13:28:08 miod Exp $
+#	$OpenBSD: disktab,v 1.4 2015/08/14 23:45:55 krw Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#128:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#128:\
 	:ta=4.2BSD:oa#0:pa#4096:fa#512:ba#4096\
 	:ob#0:pb#0:oc#0:pc#4096:
diff --git a/etc/etc.hppa/disktab b/etc/etc.hppa/disktab
index 901ef4c129c..da2f386595d 100644
--- a/etc/etc.hppa/disktab
+++ b/etc/etc.hppa/disktab
@@ -1,6 +1,6 @@
-#	$OpenBSD: disktab,v 1.8 2010/08/26 01:35:44 krw Exp $
+#	$OpenBSD: disktab,v 1.9 2015/08/14 23:45:55 krw Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#18:nt#2:ns#128:\
+	:dt=rdroot:se#512:nc#18:nt#2:ns#128:\
 	:ta=4.2BSD:oa#0:pa#4608:fa#1024:ba#8192:\
 	:ob#0:pb#0:oc#0:pc#4608:
diff --git a/etc/etc.hppa64/disktab b/etc/etc.hppa64/disktab
index 2eab166c82e..e813dfd0186 100644
--- a/etc/etc.hppa64/disktab
+++ b/etc/etc.hppa64/disktab
@@ -1,6 +1,6 @@
-#	$OpenBSD: disktab,v 1.3 2010/08/26 21:46:55 krw Exp $
+#	$OpenBSD: disktab,v 1.4 2015/08/14 23:45:55 krw Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#20:nt#2:ns#128:\
+	:dt=rdroot:se#512:nc#20:nt#2:ns#128:\
 	:ta=4.2BSD:oa#0:pa#5120:fa#1024:ba#8192:\
 	:ob#0:pb#0:oc#0:pc#5120:
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index d5a6448bf58..0f0c615b514 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -1,35 +1,35 @@
-#	$OpenBSD: disktab,v 1.24 2015/08/13 18:02:57 krw Exp $
+#	$OpenBSD: disktab,v 1.25 2015/08/14 23:45:55 krw Exp $
 
 mini34|gzip bsd.rd disk image 3.40625MB:\
-	:ty=SCSI:se#512:nt#1:ns#64:nc#109:\
+	:dt=rdroot:se#512:nt#1:ns#64:nc#109:\
 	:pa#6912:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#6976:oc#0:
 
 install240|install.fs disk image 240MB:\
-	:ty=SCSI:se#512:nt#1:ns#64:nc#7680:\
+	:dt=rdroot:se#512:nt#1:ns#64:nc#7680:\
 	:pa#491456:oa#64:ba#8192:fa#1024:ta=4.2BSD: \
 	:pc#491520:oc#0:
 
 floppy288|3in|3.5in High Density Floppy, 2.88MB:\
-	:dt=floppy:ty=floppy:se#512:nt#2:ns#36:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#36:nc#80:\
 	:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD: \
 	:pb#5760:ob#0:\
 	:pc#5760:oc#0:
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
 floppy5|5in|5.25in High Density Floppy:\
-	:dt=floppy:ty=floppy:se#512:nt#2:ns#15:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#15:nc#80:\
 	:pa#2400:oa#0:ba#4096:fa#512:ta=4.2BSD: \
 	:pb#2400:ob#0:bb#4096:fb#512:\
 	:pc#2400:oc#0:bc#4096:fc#512:
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=ramdisk:se#512:nt#2:ns#121:nc#16:\
+	:dt=rdroot:se#512:nt#2:ns#121:nc#16:\
 	:pa#3872:oa#0:ta=4.2BSD:ba#4096:fa#512:\
 	:pb#0:ob#0:tb=swap:\
 	:pc#3872:oc#0:
diff --git a/etc/etc.landisk/disktab b/etc/etc.landisk/disktab
index 3a64a1291da..a748cab2112 100644
--- a/etc/etc.landisk/disktab
+++ b/etc/etc.landisk/disktab
@@ -1,20 +1,20 @@
-# $OpenBSD: disktab,v 1.3 2010/07/02 20:33:54 tedu Exp $
+# $OpenBSD: disktab,v 1.4 2015/08/14 23:45:55 krw Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#256:\
 	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#8192:
 
 
 rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#160:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#160:\
 	:oa#0:pa#5120:ta=4.2BSD:fa#512:ba#4096:\
 	:ob#0:pb#0:tb=swap:\
 	:oc#0:pc#5120:
 
 mroot2.5M|miniroot2.5M|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#160:nt#2:ns#16:\
+	:dt=rdroot:se#512:nc#160:nt#2:ns#16:\
 	:oa#16:pa#5104:ta=4.2BSD:fa#512:ba#4096:\
 	:ob#0:pb#0:tb=swap:\
 	:oc#0:pc#5120:
diff --git a/etc/etc.loongson/disktab b/etc/etc.loongson/disktab
index 5e4098d0ff4..51c4770f83a 100644
--- a/etc/etc.loongson/disktab
+++ b/etc/etc.loongson/disktab
@@ -1,11 +1,11 @@
-# $OpenBSD: disktab,v 1.3 2010/07/02 20:33:54 tedu Exp $
+# $OpenBSD: disktab,v 1.4 2015/08/14 23:45:56 krw Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#256:\
 	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#8192:
 
 miniroot|Installation root FS image:\
-	:ty=simulated:se#512:nc#9:nt#16:ns#128:\
+	:dt=rdroot:se#512:nc#9:nt#16:ns#128:\
 	:oc#0:pc#18432:
diff --git a/etc/etc.luna88k/disktab b/etc/etc.luna88k/disktab
index 3f28666e385..e9330812c3e 100644
--- a/etc/etc.luna88k/disktab
+++ b/etc/etc.luna88k/disktab
@@ -1,13 +1,13 @@
-#	$OpenBSD: disktab,v 1.3 2014/02/27 18:55:39 miod Exp $
+#	$OpenBSD: disktab,v 1.4 2015/08/14 23:45:56 krw Exp $
 
 # XXX - Would like :ba#4096:fa#512: but that panics...
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#128:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#128:\
 	:ta=4.2BSD:oa#0:pa#4096:fa#512:ba#4096\
 	:ob#0:pb#0:oc#0:pc#4096:
 miniroot|Installation root-on-swap FS image:\
-	:ty=simulated:se#512:ns#32:nt#8:nc#32:\
+	:dt=rdroot:se#512:ns#32:nt#8:nc#32:\
 	:ta=4.2BSD:oa#0:pa#8192:\
 	:ob#0:pb#0:oc#0:pc#8192:
 
diff --git a/etc/etc.macppc/disktab b/etc/etc.macppc/disktab
index 8252952d511..ea6c926a5ac 100644
--- a/etc/etc.macppc/disktab
+++ b/etc/etc.macppc/disktab
@@ -1,18 +1,18 @@
-# $OpenBSD: disktab,v 1.5 2015/08/13 18:02:57 krw Exp $
+# $OpenBSD: disktab,v 1.6 2015/08/14 23:45:56 krw Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#256:\
 	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#8192:
 
 # pseudo-geometry taken from rd7945
 miniroot:\
-	:ty=winchester:ns#16:nt#7:nc#968:\
+	:dt=rdroot:ns#16:nt#7:nc#968:\
 	:pa#10240:ba#8192:fa#1024:
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
diff --git a/etc/etc.octeon/disktab b/etc/etc.octeon/disktab
index a7d6f7c4b0b..b55eee74a0a 100644
--- a/etc/etc.octeon/disktab
+++ b/etc/etc.octeon/disktab
@@ -1,15 +1,15 @@
-# $OpenBSD: disktab,v 1.2 2015/06/09 19:20:36 jasper Exp $
+# $OpenBSD: disktab,v 1.3 2015/08/14 23:45:56 krw Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#20:nt#4:ns#128:\
+	:dt=rdroot:se#512:nc#20:nt#4:ns#128:\
 	:ta=4.2BSD:oa#0:pa#10240:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#10240:
 
 miniroot|Installation root FS image:\
-	:ty=simulated:se#512:nc#9:nt#16:ns#128:\
+	:dt=rdroot:se#512:nc#9:nt#16:ns#128:\
 	:oc#0:pc#24576:
 
 minicdroot|minicdramdiskroot|Boot CD-ROM image:\
-	:ty=simulated:se#512:nc#48:nt#4:ns#128:\
+	:dt=rdroot:se#512:nc#48:nt#4:ns#128:\
 	:ta=4.2BSD:oa#0:pa#24576:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#24576:
diff --git a/etc/etc.sgi/disktab b/etc/etc.sgi/disktab
index 252cc6d48b7..6d56e925ef6 100644
--- a/etc/etc.sgi/disktab
+++ b/etc/etc.sgi/disktab
@@ -1,16 +1,16 @@
-# $OpenBSD: disktab,v 1.14 2014/03/15 04:07:39 miod Exp $
+# $OpenBSD: disktab,v 1.15 2015/08/14 23:45:56 krw Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#20:nt#4:ns#128:\
+	:dt=rdroot:se#512:nc#20:nt#4:ns#128:\
 	:ta=4.2BSD:oa#0:pa#10240:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#10240:
 
 minicdroot|minicdramdiskroot|Boot CD-ROM image:\
-	:ty=simulated:se#512:nc#52:nt#4:ns#128:\
+	:dt=rdroot:se#512:nc#52:nt#4:ns#128:\
 	:ta=4.2BSD:oa#0:pa#26624:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#26624:
 
 cdroot|cdramdiskroot|Installation CD-ROM image:\
-	:ty=simulated:se#2048:nc#16:nt#316:ns#32:\
+	:dt=rdroot:se#2048:nc#16:nt#316:ns#32:\
 	:ta=4.2BSD:oa#8320:pa#153472:fa#2048:ba#16384:\
 	:ob#0:pb#0:oc#0:pc#161792:op#0:pp#8320:
diff --git a/etc/etc.socppc/disktab b/etc/etc.socppc/disktab
index 51344fc2e0d..461c3dcf2f7 100644
--- a/etc/etc.socppc/disktab
+++ b/etc/etc.socppc/disktab
@@ -1,11 +1,11 @@
-# $OpenBSD: disktab,v 1.5 2010/08/16 14:29:17 kettenis Exp $
+# $OpenBSD: disktab,v 1.6 2015/08/14 23:45:56 krw Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#256:\
 	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#8192:
 
 miniroot|Installation root FS image:\
-	:ty=simulated:se#512:nc#8:nt#16:ns#63:\
+	:dt=rdroot:se#512:nc#8:nt#16:ns#63:\
 	:ta=4.2BSD:oa#1024:pa#7040:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#8064:ti=boot:oi#63:pi#512:
diff --git a/etc/etc.sparc64/disktab b/etc/etc.sparc64/disktab
index c50f3a74746..016c9d31f11 100644
--- a/etc/etc.sparc64/disktab
+++ b/etc/etc.sparc64/disktab
@@ -1,33 +1,33 @@
-# $OpenBSD: disktab,v 1.16 2015/08/13 18:02:57 krw Exp $
+# $OpenBSD: disktab,v 1.17 2015/08/14 23:45:56 krw Exp $
 
 miniroot:\
-	:ty=winchester:se#512:nt#2:ns#64:nc#90:\
+	:dt=rdroot:se#512:nt#2:ns#64:nc#90:\
 	:pa#11520:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
 	:pb#0:ob#0:\
 	:pc#11520:oc#0:
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#192:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#192:\
 	:ta=4.2BSD:oa#0:pa#6144:fa#1024:ba#8192:\
 	:ob#0:pb#0:oc#0:pc#6144
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
 # test if not having an 'a' works?
 fakecdrom|Fake image for Bootable CDROM:\
-	:ty=winchester:se#512:nt#1:ns#640:nc#2048:\
+	:dt=rdroot:se#512:nt#1:ns#640:nc#2048:\
 	:pa#1310720:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
 	:pb#1310720:ob#0:bb#8192:fb#1024:tb=4.2BSD:\
 	:pc#1310720:oc#0:bc#8192:fc#1024:tc=4.2BSD:\
 	:pd#1310720:od#0:bd#8192:fd#1024:td=4.2BSD:
 
 fakeramdisk:\
-	:ty=winchester:se#512:nt#1:ns#32:nc#180:\
+	:dt=rdroot:se#512:nt#1:ns#32:nc#180:\
 	:pa#5760:oa#0:ba#8192:fa#4096:ta=4.2BSD:\
 	:pc#5760:oc#0:
 
diff --git a/etc/etc.vax/disktab b/etc/etc.vax/disktab
index d1c7e8741cb..a67955a7917 100644
--- a/etc/etc.vax/disktab
+++ b/etc/etc.vax/disktab
@@ -1,30 +1,29 @@
-#	$OpenBSD: disktab,v 1.17 2015/08/13 18:02:57 krw Exp $
+#	$OpenBSD: disktab,v 1.18 2015/08/14 23:45:56 krw Exp $
 
 bootroot|fake-type used in install boot:\
-	:ty=fake:se#512:nt#1:ns#512:nc#1:\
+	:dt=rdroot:se#512:nt#1:ns#512:nc#1:\
 	:pa#512:oa#0:ba#4096:fa#512:\
 	:pb#512:ob#0:bb#4096:fb#512:\
 	:pc#512:oc#0:bc#4096:fc#512:
 
 miniroot|fake-type used when installation:\
-	:ty=fake:se#512:nt#1:ns#2048:nc#1:\
+	:dt=rdroot:se#512:nt#1:ns#2048:nc#1:\
 	:pa#4096:oa#0:ba#4096:fa#512:ta=4.2BSD:ba#4096: \
 	:pb#4096:ob#0:bb#4096:fb#512:\
 	:pc#4096:oc#0:bc#4096:fc#512:
 
 rdroot:\
-	:ty=ramdisk:se#512:nt#2:ns#8:nc#192:\
+	:dt=rdroot:se#512:nt#2:ns#8:nc#192:\
 	:pa#3072:oa#0:ta=4.2BSD:ba#4096:fa#1024:\
 	:pc#3072:oc#0:
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
 isoroot:\
-	:ty=fake:se#512:nt#11:ns#33:nc#2200:\
+	:dt=rdroot:se#512:nt#11:ns#33:nc#2200:\
 	:pa#798600:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
 	:pc#798600:oc#0:
-
diff --git a/etc/etc.zaurus/disktab b/etc/etc.zaurus/disktab
index afed5a6a37d..a892dfbdb99 100644
--- a/etc/etc.zaurus/disktab
+++ b/etc/etc.zaurus/disktab
@@ -1,25 +1,25 @@
-# $OpenBSD: disktab,v 1.4 2015/08/13 18:02:57 krw Exp $
+# $OpenBSD: disktab,v 1.5 2015/08/14 23:45:56 krw Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#256:\
 	:ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\
 	:ob#0:pb#0:oc#0:pc#8192:
 
 
 rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\
-	:ty=simulated:se#512:nc#16:nt#2:ns#160:\
+	:dt=rdroot:se#512:nc#16:nt#2:ns#160:\
 	:oa#0:pa#5120:ta=4.2BSD:fa#512:ba#4096:\
 	:ob#0:pb#0:tb=swap:\
 	:oc#0:pc#5120:
 
 # pseudo-geometry taken from rd794
 miniroot:\
-	:ty=winchester:ns#16:nt#7:nc#968:\
+	:dt=rdroot:ns#16:nt#7:nc#968:\
 	:pa#10240:ba#8192:fa#1024:
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
-	:ty=floppy:se#512:nt#2:ns#18:nc#80:\
+	:dt=floppy:se#512:nt#2:ns#18:nc#80:\
 	:pa#2880:oa#0:ba#4096:fa#512:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index 59f34936414..bec93fd92fb 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disktab.5,v 1.15 2015/08/13 18:02:56 krw Exp $
+.\"	$OpenBSD: disktab.5,v 1.16 2015/08/14 23:45:56 krw Exp $
 .\"	$NetBSD: disktab.5,v 1.4 1994/11/30 19:31:15 jtc Exp $
 .\"
 .\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"     @(#)disktab.5	8.1 (Berkeley) 6/5/93
 .\"
-.Dd $Mdocdate: August 13 2015 $
+.Dd $Mdocdate: August 14 2015 $
 .Dt DISKTAB 5
 .Os
 .Sh NAME
@@ -61,7 +61,6 @@ The last name given should be a long name fully identifying the disk.
 The following list indicates the normal values stored for each disk entry:
 .Bl -column "d[0-4]" "bool" "Description"
 .It Sy Name Ta Sy Type Ta Sy Description
-.It \&ty Ta str Ta "Type of disk (e.g., removable, winchester)."
 .It \&dt Ta str Ta "Type of controller (e.g.,SMD, ESDI, floppy)."
 .It \&ns Ta num Ta "Number of sectors per track."
 .It \&nt Ta num Ta "Number of tracks per cylinder."
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 9a790df1ec5..6f3deaa46e4 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: disklabel.h,v 1.66 2015/07/23 18:02:59 krw Exp $	*/
+/*	$OpenBSD: disklabel.h,v 1.67 2015/08/14 23:45:56 krw Exp $	*/
 /*	$NetBSD: disklabel.h,v 1.41 1996/05/10 23:07:37 mark Exp $	*/
 
 /*
@@ -226,6 +226,7 @@ struct	__partitionv0 {		/* old (v0) partition table entry */
 #define	DTYPE_VND		12		/* vnode pseudo-disk */
 #define	DTYPE_ATAPI		13		/* ATAPI */
 #define DTYPE_RAID		14		/* was: RAIDframe */
+#define DTYPE_RDROOT		15		/* ram disk root */
 
 #ifdef DKTYPENAMES
 static char *dktypenames[] = {
@@ -244,6 +245,7 @@ static char *dktypenames[] = {
 	"vnd",
 	"ATAPI",
 	"RAID",
+	"rdroot",
 	NULL
 };
 #define DKMAXTYPES	(sizeof(dktypenames) / sizeof(dktypenames[0]) - 1)