cleanup the disktab files. yes, this means you will have to manually

disklabel the "HP C3010 / Cranel 2.0GB Fast SCSI2 H10" crammed inside your
palm device, but that's the price of progress.  hopefully i didn't whack
anything important.
ok deraadt

23 files changed, 23 insertions, 7227 deletions

diff --git a/etc/etc.alpha/disktab b/etc/etc.alpha/disktab
index e8a71ca1a12..e82fff31987 100644
--- a/etc/etc.alpha/disktab
+++ b/etc/etc.alpha/disktab
@@ -1,14 +1,4 @@
-#	$OpenBSD: disktab,v 1.18 2008/03/06 06:38:03 deraadt Exp $
-#	$NetBSD: disktab,v 1.2 1995/10/13 03:09:39 cgd Exp $
-
-# A DEC RZ25, configured so that all of the free partition IDs are at
-# the end, etc.  A good setup to make a disk image from...
-rz25|RZ25|DEC RZ25 SCSI:\
-	:ty=winchester:dt=SCSI:ns#62:nt#9:nc#1476:\
-	:pa#111600:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
-	:pb#111600:ob#111600:tb=swap:\
-	:pc#823608:oc#0:\
-	:pd#600408:od#223200:bd#8192:fd#1024:td=4.2BSD:
+#	$OpenBSD: disktab,v 1.19 2010/07/02 20:33:54 tedu Exp $
 
 floppy|floppy3|3in|3.5in High Density Floppy:\
 	:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
diff --git a/etc/etc.amd64/disktab b/etc/etc.amd64/disktab
index 828fc5728bb..8ffdfbd5e1b 100644
--- a/etc/etc.amd64/disktab
+++ b/etc/etc.amd64/disktab
@@ -1,40 +1,4 @@
-#	$OpenBSD: disktab,v 1.9 2010/04/06 03:54:42 deraadt Exp $
-
-# Disk geometry and partition layout tables.
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, ns*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-p]	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#	t[a-p]	partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
-
-floppy576|3in|3.5in High Density Floppy, 5.76MB:\
-	:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#160:\
-	:pa#11520:oa#0:ba#4096:fa#512:ta=4.2BSD: \
-	:pb#11520:ob#0:\
-	:pc#11520:oc#0:
+#	$OpenBSD: disktab,v 1.10 2010/07/02 20:33:54 tedu Exp $
 
 floppy288|3in|3.5in High Density Floppy, 2.88MB:\
 	:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
@@ -48,12 +12,6 @@ floppy|floppy3|3in|3.5in High Density Floppy:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
-floppy5|5in|5.25in High Density Floppy:\
-	:dt=floppy:ty=floppy:se#512:nt#2:rm#300: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#140:nc#16:\
 	:pa#4480:oa#0:ta=4.2BSD:ba#4480:fa#512:\
diff --git a/etc/etc.armish/disktab b/etc/etc.armish/disktab
index 82e2731fa17..abc4580e430 100644
--- a/etc/etc.armish/disktab
+++ b/etc/etc.armish/disktab
@@ -1,22 +1,4 @@
-# $OpenBSD: disktab,v 1.1 2006/06/06 00:01:49 drahn Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#
-
+# $OpenBSD: disktab,v 1.2 2010/07/02 20:33:54 tedu Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -42,834 +24,3 @@ floppy|floppy3|3in|3.5in High Density Floppy:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
-ASI-1.0GIBM:\
-	:ty#winchester:ns#80:nt#15:nc#1632:
-
-Arte DEC DSP3160S:\
-	:ty#winchester:ns#112:nt#16:nc#1744:
-
-CDC 9720-850:\
-	:ty#XD7053:ns#66:nt#15:nc#1358:
-
-CDC EMD 9720:\
-	:ty#XD7053:ns#48:nt#10:nc#1147:
-
-CDC EMD 9720-1230:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:
-
-CDC IPI 9720:\
-	:ty#ISP-80:ns#82:nt#15:nc#1631:\
-	:pa#33210:oa#0:ba#8192:\
-	:pb#131610:ob#33210:\
-	:pc#2006130:oc#0:\
-	:pg#196800:og#164820:\
-	:ph#1644510:oh#361620:
-
-CDC IPI 9722:\
-	:ty#ISP-80:ns#156:nt#7:nc#1630:\
-	:pa#33852:oa#0:ba#8192:\
-	:pb#132132:ob#33852:\
-	:pc#1779960:oc#0:\
-	:pg#197652:og#165984:\
-	:ph#1416324:oh#363636:
-
-CDC Wren IV 94171-344:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-CONNER 30170E:\
-	:ty#winchester:ns#46:nt#8:nc#897:\
-	:pa#14720:oa#0:ba#8192:\
-	:pb#40480:ob#14720:\
-	:pc#330096:oc#0:\
-	:pg#274896:og#55200:
-
-CONNER 30200:\
-	:ty#winchester:ns#49:nt#4:nc#2121:\
-	:pc#415716:oc#0:
-
-CONNER CFP4207S  4.28GB:\
-	:ty#winchester:ns#125:nt#20:nc#3353:\
-	:pc#8382500:oc#0:
-
-CONNER CP3500-540MB-3.5:\
-	:ty#winchester:ns#50:nt#12:nc#1768:\
-	:pc#1060800:oc#0:
-
-CP3100:\
-	:ty#winchester:ns#49:nt#4:nc#1023:\
-	:pc#204864:oc#0:
-
-Conner CFP1060:\
-	:ty#winchester:ns#111:nt#8:nc#2329:
-
-Conner CP3540:\
-	:ty#winchester:ns#49:nt#12:nc#1805:
-
-DEC DSP3107L:\
-	:ty#winchester:ns#83:nt#8:nc#3147:\
-	:pc#2089608:oc#0:
-
-DEC DSP3210 2 GB:\
-	:ty#winchester:ns#86:nt#16:nc#3040:\
-	:pc#4183040:oc#0:
-
-DEC DSP5200:\
-	:ty#winchester:ns#71:nt#21:nc#2619:\
-	:pa#32802:oa#0:ba#8192:\
-	:pb#65604:ob#32802:\
-	:pc#3904929:oc#0:\
-	:pg#3806523:og#98406:
-
-DEC DSP5350:\
-	:ty#winchester:ns#91:nt#25:nc#3053:
-
-DEC_RZ26:\
-	:ty#winchester:ns#57:nt#14:nc#2568:\
-	:pa#66234:oa#0:ba#8192:\
-	:pb#132468:ob#66234:\
-	:pc#2049264:oc#0:\
-	:pg#1850562:og#198702:
-
-DEC_RZ28:\
-	:ty#winchester:ns#84:nt#16:nc#3043:\
-	:pa#64512:oa#0:ba#8192:\
-	:pb#196224:ob#64512:\
-	:pc#4089792:oc#0:\
-	:pg#3827712:og#260736:
-
-DEC_RZ58:\
-	:ty#winchester:ns#85:nt#15:nc#2112:
-
-DEC_RZ58_whole_disk:\
-	:\
-	:pc#2692800:oc#0:
-
-DEC_RZ74:\
-	:ty#winchester:ns#91:nt#25:nc#3053:\
-	:pa#65975:oa#0:ba#8192:\
-	:pb#193375:ob#65975:\
-	:pc#4192825:oc#0:\
-	:pg#3931200:og#259350:\
-	:ph#2752750:oh#4192825:
-
-Fujitsu M2243AS:\
-	:ty#ACB4000:ns#17:nt#11:nc#752:
-
-Fujitsu M2246E:\
-	:ty#winchester:ns#35:nt#6:nc#1196:\
-	:pa#16170:oa#0:ba#8192:\
-	:pb#28140:ob#16170:\
-	:pc#251160:oc#0:\
-	:pg#206850:og#44310:
-
-Fujitsu M2263SA:\
-	:ty#winchester:ns#53:nt#15:nc#1652:
-
-Fujitsu M2266SA 1.2GB:\
-	:ty#winchester:ns#85:nt#15:nc#1652:
-
-Fujitsu M2266SA 1GB:\
-	:ty#winchester:ns#85:nt#15:nc#1642:
-
-Fujitsu M2344K:\
-	:ty#XD7053:ns#64:nt#27:nc#622:
-
-Fujitsu M2511A:\
-	:ty#winchester:ns#25:nt#1:nc#9950:
-
-Fujitsu M2512A small:\
-	:ty#winchester:ns#25:nt#1:nc#9950:\
-	:pc#248750:oc#0:
-
-Fujitsu M2512A v2:\
-	:ty#winchester:ns#25:nt#1:nc#17840:\
-	:pc#446000:oc#0:
-
-Fujitsu M2622SA:\
-	:ty#winchester:ns#64:nt#7:nc#1429:\
-	:pc#640192:oc#0:
-
-Fujitsu M2624FA:\
-	:ty#winchester:ns#64:nt#11:nc#1440:\
-	:pa#22528:oa#0:ba#8192:\
-	:pb#67584:ob#22528:\
-	:pc#1013760:oc#0:\
-	:pg#450560:og#90112:\
-	:ph#473088:oh#540672:
-
-Fujitsu M2652SA:\
-	:ty#winchester:ns#88:nt#20:nc#1935:
-
-Fujitsu M2654SA:\
-	:ty#winchester:ns#88:nt#21:nc#2174:
-
-Fujitsu M2684S:\
-	:ty#SCSI:ns#74:nt#6:nc#2338:
-
-Fujitsu-M2284/M2322:\
-	:ty#XY450:ns#32:nt#10:nc#821:
-
-Fujitsu-M2312K:\
-	:ty#XY450:ns#32:nt#7:nc#587:
-
-Fujitsu-M2333:\
-	:ty#XD7053:ns#67:nt#10:nc#821:
-
-Fujitsu-M2351 Eagle:\
-	:ty#XD7053:ns#46:nt#20:nc#840:
-
-Fujitsu-M2361 Eagle:\
-	:ty#XD7053:ns#67:nt#20:nc#840:
-
-Fujitsu-M2372K:\
-	:ty#XD7053:ns#67:nt#27:nc#743:
-
-Fujitsu-M2382:\
-	:ty#XD7053:ns#81:nt#27:nc#743:\
-	:pa#80919:oa#0:ba#8192:\
-	:pb#129033:ob#80919:\
-	:pc#1624941:oc#0:\
-	:pd#470205:od#209952:\
-	:pe#944784:oe#680157:\
-	:pf#209952:of#0:\
-	:pg#1414989:og#209952:\
-	:ph#1544022:oh#80919:
-
-Fujitsu-M2624S-512:\
-	:ty#winchester:ns#64:nt#11:nc#1429:
-
-Fujitsu-M2651SA:\
-	:ty#winchester:ns#88:nt#16:nc#1934:\
-	:pc#2723072:oc#0:
-
-Fujitsu-M2694ESA:\
-	:ty#winchester:ns#77:nt#15:nc#1830:
-
-HP 97549T:\
-	:ty#winchester:ns#64:nt#16:nc#1909:
-
-HP 97556:\
-	:ty#winchester:ns#72:nt#11:nc#1668:
-
-HP 97558:\
-	:ty#winchester:ns#72:nt#15:nc#1933:
-
-HP 97560:\
-	:ty#winchester:ns#72:nt#19:nc#1933:
-
-HP C2247 1.05GB:\
-	:ty#winchester:ns#95:nt#13:nc#1661:\
-	:pc#2051335:oc#0:\
-	:pg#1640080:og#0:\
-	:ph#411255:oh#1640080:
-
-HP C3010 / Cranel 2.0GB Fast SCSI2 H10:\
-	:ty#winchester:ns#95:nt#19:nc#2165:
-
-HP97548SU 664MB:\
-	:ty#winchester:ns#56:nt#16:nc#1445:\
-	:pa#35840:oa#0:ba#8192:\
-	:pb#71680:ob#35840:\
-	:pc#1294720:oc#0:\
-	:pg#197120:og#215040:\
-	:ph#342720:oh#609280:
-
-Hewlett Packard C2490A:\
-	:ty#winchester:ns#107:nt#18:nc#2159:
-
-Hewlett Packard C3323A:\
-	:ty#winchester:ns#98:nt#7:nc#2995:
-
-Hewlett Packard C3725S:\
-	:ty#winchester:ns#140:nt#9:nc#3362:\
-	:pc#4236120:oc#0:\
-	:ph#4193280:oh#1260:
-
-Hitachi DK315C-10:\
-	:ty#winchester:ns#75:nt#11:nc#2467:
-
-Hitachi DK315C-11:\
-	:ty#winchester:ns#58:nt#15:nc#2478:
-
-Hitachi DK315C-14:\
-	:ty#winchester:ns#75:nt#15:nc#2462:
-
-Hitachi DK326C-10:\
-	:ty#winchester:ns#87:nt#7:nc#3200:
-
-Hitachi DK326C-6:\
-	:ty#winchester:ns#87:nt#4:nc#3200:
-
-Hitachi DK515C-78:\
-	:ty#winchester:ns#69:nt#14:nc#1354:
-
-Hitachi DK516C-16:\
-	:ty#winchester:ns#80:nt#15:nc#2170:
-
-Hitachi DK517C-37:\
-	:ty#winchester:ns#81:nt#21:nc#3297:
-
-Hitachi DK815-10:\
-	:ty#XD7053:ns#67:nt#15:nc#1735:
-
-IBM 0662-S12:\
-	:ty#winchester:ns#114:nt#6:nc#3002:
-
-IBM 0662S12:\
-	:ty#winchester:ns#108:nt#5:nc#3803:
-
-IBM 0663-E15:\
-	:ty#winchester:ns#37:nt#20:nc#3182:
-
-IBM 0663L12:\
-	:ty#winchester:ns#66:nt#15:nc#1979:\
-	:pc#1959210:oc#0:
-
-IBM 0664-M1H/N1H:\
-	:ty#winchester:ns#86:nt#16:nc#2856:
-
-IBM 0664CSH:\
-	:ty#winchester:ns#125:nt#30:nc#2787:
-
-IBM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM DFHSS1x:\
-	:ty#winchester:ns#125:nt#4:nc#4383:
-
-IBM DFHSS2x:\
-	:ty#winchester:ns#125:nt#8:nc#4388:
-
-IBM DFHSS4x:\
-	:ty#winchester:ns#125:nt#16:nc#4390:
-
-IBM DPES-31080:\
-	:ty#winchester:ns#108:nt#4:nc#4901:\
-	:pc#2117232:oc#0:
-
-IBM DSAS-3270:\
-	:ty#winchester:ns#108:nt#2:nc#2542:
-
-IBM DSAS-3360:\
-	:ty#winchester:ns#108:nt#2:nc#3297:
-
-IBM DSAS-3540:\
-	:ty#winchester:ns#108:nt#3:nc#3259:
-
-IBM DSAS-3720:\
-	:ty#winchester:ns#108:nt#4:nc#3292:
-
-IBM OEM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM OEM DFHSS2F:\
-	:ty#winchester:ns#135:nt#8:nc#4076:\
-	:pa#4100760:oa#0:ba#8192:\
-	:pb#301320:ob#4100760:
-
-MAXOPTIX (NON-ISO, 1024b) DATA:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 1024b) SYSTEM:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 512b) DATA:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MAXOPTIX (NON-ISO, 512b) SYSTEM:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MICROP 4221-09MZ  10204:\
-	:ty#winchester:ns#139:nt#9:nc#3198:\
-	:pc#4000698:oc#0:
-
-MICROPOLIS 1991-27:\
-	:ty#winchester:ns#149:nt#27:nc#4400:
-
-MICROPOLIS 3243-19:\
-	:ty#winchester:ns#106:nt#19:nc#4139:
-
-MICROPOLIS 4110-09:\
-	:ty#winchester:ns#95:nt#9:nc#2283:
-
-Maxtor 7213SR NB:\
-	:ty#winchester:ns#65:nt#4:nc#1595:\
-	:pc#414700:oc#0:\
-	:pg#414700:og#0:
-
-Maxtor DXP3105S:\
-	:ty#winchester:ns#57:nt#14:nc#2568:
-
-Maxtor LXT-200S:\
-	:ty#winchester:ns#43:nt#7:nc#1117:
-
-Maxtor LXT-340SY:\
-	:ty#winchester:ns#70:nt#7:nc#1355:
-
-Maxtor LXT535ST:\
-	:ty#winchester:ns#61:nt#11:nc#1547:\
-	:pc#1038037:oc#0:
-
-Maxtor MXT1240S:\
-	:ty#winchester:ns#70:nt#15:nc#2306:\
-	:pc#2421300:oc#0:\
-	:pg#2421300:og#0:
-
-Maxtor P0-12S (1632):\
-	:ty#winchester:ns#90:nt#15:nc#1478:\
-	:pc#1995300:oc#0:\
-	:pg#1995300:og#0:
-
-Maxtor P0-12S (1795):\
-	:ty#winchester:ns#90:nt#15:nc#1510:\
-	:pc#2038500:oc#0:\
-	:pg#2038500:og#0:
-
-Maxtor P1-17S:\
-	:ty#winchester:ns#83:nt#19:nc#1816:\
-	:pa#78850:oa#0:ba#8192:\
-	:pb#78850:ob#78850:\
-	:pc#2863832:oc#0:\
-	:pd#78850:od#157700:\
-	:pg#2469582:og#236550:\
-	:ph#78850:oh#2706132:
-
-Maxtor P1-17S NB:\
-	:ty#winchester:ns#90:nt#19:nc#1711:\
-	:pc#2925810:oc#0:\
-	:pg#2925810:og#0:
-
-Maxtor XT-1050:\
-	:ty#ACB4000:ns#17:nt#5:nc#1020:
-
-Maxtor XT-3280S:\
-	:ty#winchester:ns#25:nt#15:nc#1222:
-
-Maxtor XT-4380S:\
-	:ty#winchester:ns#36:nt#15:nc#1202:
-
-Maxtor XT-8380S:\
-	:ty#winchester:ns#53:nt#8:nc#1626:
-
-Maxtor XT-8610E:\
-	:ty#winchester:ns#52:nt#12:nc#1626:
-
-Maxtor XT-8760E:\
-	:ty#winchester:ns#50:nt#15:nc#1616:\
-	:pa#97500:oa#0:ba#8192:\
-	:pb#63750:ob#658500:\
-	:pc#1212000:oc#0:\
-	:pd#280500:od#97500:\
-	:pe#280500:oe#378000:\
-	:pf#489750:of#722250:\
-	:pg#561000:og#97500:\
-	:ph#658500:oh#0:
-
-Maxtor XT-8760S:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-Micropolis 1304:\
-	:ty#ACB4000:ns#17:nt#6:nc#825:
-
-Micropolis 1325:\
-	:ty#ACB4000:ns#17:nt#8:nc#1022:
-
-Micropolis 1355:\
-	:ty#winchester:ns#34:nt#8:nc#1018:
-
-Micropolis 1528-15:\
-	:ty#winchester:ns#83:nt#15:nc#2102:\
-	:pa#32370:oa#0:ba#8192:\
-	:pb#64740:ob#32370:\
-	:pc#2616990:oc#0:\
-	:pg#2519880:og#97110:
-
-Micropolis 1548-15:\
-	:ty#winchester:ns#131:nt#15:nc#1701:\
-	:pa#33405:oa#0:ba#8192:\
-	:pb#66810:ob#33405:\
-	:pc#3342465:oc#0:\
-	:pg#3242250:og#100215:
-
-Micropolis 1558:\
-	:ty#winchester:ns#35:nt#15:nc#1218:
-
-Micropolis 1578-15:\
-	:ty#winchester:ns#35:nt#15:nc#1231:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#646275:oc#0:\
-	:pg#548625:og#97650:
-
-Micropolis 1588-15:\
-	:ty#winchester:ns#53:nt#15:nc#1637:\
-	:pa#32595:oa#0:ba#8192:\
-	:pb#65190:ob#32595:\
-	:pc#1301415:oc#0:\
-	:pg#1203630:og#97785:
-
-Micropolis 1598-15:\
-	:ty#winchester:ns#70:nt#15:nc#1931:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#2027550:oc#0:\
-	:pg#1929900:og#97650:
-
-Micropolis 1624-7:\
-	:ty#winchester:ns#114:nt#7:nc#1647:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#1314306:oc#0:\
-	:pg#1216152:og#98154:
-
-Micropolis 1674-7:\
-	:ty#winchester:ns#35:nt#7:nc#1255:\
-	:pa#16415:oa#0:ba#8192:\
-	:pb#32830:ob#16415:\
-	:pc#307475:oc#0:\
-	:pg#258230:og#49245:
-
-Micropolis 1684-7:\
-	:ty#winchester:ns#53:nt#7:nc#1785:\
-	:pa#32648:oa#0:ba#8192:\
-	:pb#65296:ob#32648:\
-	:pc#662235:oc#0:\
-	:pg#564291:og#97944:
-
-Micropolis 1908-15:\
-	:ty#winchester:ns#95:nt#15:nc#1890:\
-	:pa#32775:oa#0:ba#8192:\
-	:pb#65550:ob#32775:\
-	:pc#2693250:oc#0:\
-	:pg#2594925:og#98325:
-
-Micropolis 1924-21:\
-	:ty#winchester:ns#94:nt#21:nc#2072:\
-	:pa#33558:oa#0:ba#8192:\
-	:pb#67116:ob#33558:\
-	:pc#4090128:oc#0:\
-	:pg#3989454:og#100674:
-
-Micropolis 1926-15:\
-	:ty#winchester:ns#101:nt#15:nc#2769:\
-	:pa#33330:oa#0:ba#8192:\
-	:pb#66660:ob#33330:\
-	:pc#4195035:oc#0:\
-	:pg#4095045:og#99990:
-
-Micropolis 1936-21:\
-	:ty#winchester:ns#101:nt#21:nc#2772:\
-	:pa#33936:oa#0:ba#8192:\
-	:pb#67872:ob#33936:\
-	:pc#5879412:oc#0:\
-	:pg#2846382:og#101808:\
-	:ph#2931222:oh#2948190:
-
-Micropolis 2105-8:\
-	:ty#winchester:ns#94:nt#8:nc#1448:\
-	:pa#32336:oa#0:ba#8192:\
-	:pb#64672:ob#32336:\
-	:pc#1088896:oc#0:\
-	:pg#991888:og#97008:
-
-Micropolis 2108-10:\
-	:ty#winchester:ns#94:nt#10:nc#1450:\
-	:pa#31960:oa#0:ba#8192:\
-	:pb#63920:ob#31960:\
-	:pc#1363000:oc#0:\
-	:pg#1267120:og#95880:
-
-Micropolis 2112-15:\
-	:ty#winchester:ns#94:nt#15:nc#1452:\
-	:pa#33840:oa#0:ba#8192:\
-	:pb#67680:ob#33840:\
-	:pc#2047320:oc#0:\
-	:pg#1945800:og#101520:
-
-Micropolis 2205-05:\
-	:ty#winchester:ns#109:nt#5:nc#2088:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#1137960:oc#0:\
-	:pg#1039860:og#98100:
-
-Micropolis 2210-09:\
-	:ty#winchester:ns#109:nt#9:nc#2099:\
-	:pa#33354:oa#0:ba#8192:\
-	:pb#66708:ob#33354:\
-	:pc#2059119:oc#0:\
-	:pg#1959057:og#100062:
-
-Micropolis 2217-15:\
-	:ty#winchester:ns#109:nt#15:nc#2105:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#3441675:oc#0:\
-	:pg#3343575:og#98100:
-
-Micropolis 4110:\
-	:ty#winchester:ns#114:nt#9:nc#1998:
-
-Micropolis 4221:\
-	:ty#winchester:ns#109:nt#9:nc#4079:\
-	:pa#4001499:oa#0:ba#8192:\
-	:pc#4001499:oc#0:
-
-NEC D2363:\
-	:ty#XD7053:ns#67:nt#27:nc#964:
-
-NEC-D2352:\
-	:ty#XD7053:ns#57:nt#19:nc#758:
-
-QUANTUM EMPIRE_2100S:\
-	:ty#winchester:ns#137:nt#12:nc#2497:\
-	:pc#4105068:oc#0:
-
-QUANTUM LPS540S:\
-	:ty#winchester:ns#125:nt#4:nc#2113:
-
-QUANTUM PD1050iS:\
-	:ty#winchester:ns#92:nt#12:nc#1859:\
-	:pc#2052336:oc#0:
-
-QUANTUM XP34301:\
-	:ty#winchester:ns#118:nt#20:nc#3561:
-
-Quantum ELS 127S:\
-	:ty#winchester:ns#54:nt#3:nc#1541:
-
-Quantum ELS 170S:\
-	:ty#winchester:ns#54:nt#4:nc#1542:
-
-Quantum ELS 85S:\
-	:ty#winchester:ns#54:nt#2:nc#1535:
-
-Quantum Empire 1080S:\
-	:ty#winchester:ns#92:nt#16:nc#1431:
-
-Quantum Empire 540S:\
-	:ty#winchester:ns#92:nt#8:nc#1431:
-
-Quantum GoDrive 120S:\
-	:ty#winchester:ns#56:nt#4:nc#1067:
-
-Quantum GoDrive 160S:\
-	:ty#winchester:ns#58:nt#4:nc#1413:
-
-Quantum LPS 105S:\
-	:ty#winchester:ns#42:nt#4:nc#1221:
-
-Quantum LPS 120S:\
-	:ty#winchester:ns#60:nt#2:nc#1987:
-
-Quantum LPS 240S:\
-	:ty#winchester:ns#60:nt#4:nc#1995:
-
-Quantum LPS 270S:\
-	:ty#winchester:ns#76:nt#7:nc#992:
-
-Quantum LPS 525S:\
-	:ty#winchester:ns#70:nt#6:nc#2444:
-
-Quantum Lightning 730S:\
-	:ty#winchester:ns#63:nt#16:nc#1415:\
-	:pa#161280:oa#0:ba#8192:\
-	:pb#96768:ob#161280:\
-	:pc#1426320:oc#0:\
-	:pg#1168272:og#258048:
-
-Quantum PD 1050S:\
-	:ty#winchester:ns#70:nt#12:nc#2444:
-
-Quantum PD 120S:\
-	:ty#winchester:ns#42:nt#5:nc#1114:
-
-Quantum PD 1225S:\
-	:ty#winchester:ns#70:nt#14:nc#2442:
-
-Quantum PD 170S:\
-	:ty#winchester:ns#42:nt#7:nc#1117:
-
-Quantum PD 210S:\
-	:ty#winchester:ns#49:nt#7:nc#1189:
-
-Quantum PD 425S:\
-	:ty#winchester:ns#60:nt#9:nc#1540:
-
-Quantum PD 700S:\
-	:ty#winchester:ns#70:nt#8:nc#2441:
-
-Quantum ProDrive 80S:\
-	:ty#winchester:ns#34:nt#6:nc#832:
-
-Quantum XP32150:\
-	:ty#winchester:ns#109:nt#10:nc#3850:
-
-RICOH RO-5031E:\
-	:ty#winchester:ns#54:nt#15:nc#710:\
-	:pc#575100:oc#0:
-
-RZ24:\
-	:ty#winchester:ns#38:nt#8:nc#1344:\
-	:pc#409792:oc#0:
-
-RZ55:\
-	:ty#winchester:ns#35:nt#15:nc#1218:\
-	:pa#32025:oa#0:ba#8192:\
-	:pb#59850:ob#32025:\
-	:pc#639450:oc#0:\
-	:pg#547575:og#91875:
-
-SEAGATE ST11950N:\
-	:ty#winchester:ns#81:nt#15:nc#2715:\
-	:pc#3298725:oc#0:
-
-SEAGATE ST15230N:\
-	:ty#winchester:ns#111:nt#19:nc#3974:
-
-SEAGATE ST31200N:\
-	:ty#winchester:ns#85:nt#9:nc#2692:
-
-SEAGATE ST31230N:\
-	:ty#winchester:ns#104:nt#5:nc#3978:\
-	:pc#2068560:oc#0:
-
-SEAGATE ST32550N:\
-	:ty#winchester:ns#109:nt#11:nc#3495:\
-	:pc#4190505:oc#0:
-
-SEAGATE ST3600N:\
-	:ty#winchester:ns#79:nt#7:nc#1853:\
-	:pc#1024709:oc#0:
-
-ST83220K:\
-	:ty#"ISP-80":ns#102:nt#19:nc#2652:
-
-SUN0104:\
-	:ty#winchester:ns#35:nt#6:nc#974:
-
-SUN0121:\
-	:ty#winchester:ns#39:nt#4:nc#1520:
-
-SUN0207:\
-	:ty#winchester:ns#36:nt#9:nc#1254:
-
-SUN0327:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-SUN0424:\
-	:ty#winchester:ns#80:nt#9:nc#1151:
-
-SUN0535:\
-	:ty#winchester:ns#80:nt#7:nc#1866:
-
-SUN0669:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-SUN1.3G:\
-	:ty#winchester:ns#80:nt#17:nc#1965:
-
-SUN2.1G:\
-	:ty#winchester:ns#80:nt#19:nc#2733:
-
-Sabre ST82500J:\
-	:ty#XD7053:ns#82:nt#19:nc#2609:
-
-Seagate (CDC) Wren V 94181-702:\
-	:ty#winchester:ns#48:nt#15:nc#1543:
-
-Seagate (CDC) Wren VI 94191-766:\
-	:ty#winchester:ns#52:nt#15:nc#1659:
-
-Seagate (CDC) Wren VII 94601-1.2G SunOS 4.1.1:\
-	:ty#winchester:ns#70:nt#15:nc#1925:
-
-Seagate (CDC) Wren VII 94601-15:\
-	:ty#winchester:ns#71:nt#15:nc#1905:
-
-Seagate (CDC) Wren VIII ST41650N:\
-	:ty#winchester:ns#89:nt#15:nc#2070:
-
-Seagate Elite ST43400N-3.5G:\
-	:ty#winchester:ns#99:nt#21:nc#2736:\
-	:pa#2843360:oa#0:ba#8192:\
-	:pb#2843360:ob#2841993:
-
-Seagate IPI ZBR Elite:\
-	:ty#"ISP-80":ns#78:nt#17:nc#1893:\
-	:pa#34476:oa#0:ba#8192:\
-	:pb#132600:ob#34476:\
-	:pc#2510118:oc#0:\
-	:pg#663000:og#167076:\
-	:ph#1680042:oh#830076:
-
-Seagate ST11200N:\
-	:ty#winchester:ns#80:nt#15:nc#1714:\
-	:pa#2056800:oa#0:ba#8192:\
-	:pc#2056800:oc#0:
-
-Seagate ST11900N:\
-	:ty#winchester:ns#83:nt#15:nc#2619:\
-	:pb#498000:ob#0:\
-	:pc#3260655:oc#0:\
-	:ph#2761410:oh#498000:
-
-Seagate ST1239N SWIFT:\
-	:ty#winchester:ns#35:nt#9:nc#1264:
-
-Seagate ST12400N 2.4GB:\
-	:ty#winchester:ns#82:nt#19:nc#2668:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#4156744:oc#0:\
-	:pg#4058590:og#98154:
-
-Seagate ST12550N:\
-	:ty#winchester:ns#80:nt#19:nc#2747:
-
-Seagate ST1480N:\
-	:ty#winchester:ns#64:nt#9:nc#1456:
-
-Seagate ST15150N:\
-	:ty#winchester:ns#78:nt#21:nc#5119:\
-	:pc#8384922:oc#0:
-
-Seagate ST410800N Elite 9:\
-	:ty#winchester:ns#108:nt#27:nc#6087:\
-	:pc#17749692:oc#0:
-
-Seagate ST42100N - Wren 9:\
-	:ty#winchester:ns#96:nt#15:nc#2574:\
-	:pc#3706560:oc#0:
-
-Seagate ST42400N Elite 2:\
-	:ty#winchester:ns#84:nt#19:nc#2604:\
-	:pc#4155984:oc#0:
-
-Seagate Sabre-5 ST81236J:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:\
-	:pa#99630:oa#0:ba#8192:\
-	:pb#261990:ob#99630:\
-	:pc#2008590:oc#0:\
-	:pd#548580:od#361620:\
-	:pe#1098390:oe#910200:\
-	:pf#361620:of#0:\
-	:pg#1646970:og#361620:\
-	:ph#1908960:oh#99630:
-
-SeagateST3283N:\
-	:ty#winchester:ns#57:nt#5:nc#1689:
-
-Sun1.0G:\
-	:ty#winchester:ns#80:nt#15:nc#1703:
-
-SyQuest SQ555:\
-	:ty#winchester:ns#34:nt#2:nc#1273:\
-	:pc#86564:oc#0:
-
-Toshiba MK 156F:\
-	:ty#winchester:ns#34:nt#10:nc#815:
-
-Vertex V185:\
-	:ty#ACB4000:ns#17:nt#7:nc#1163:
-
diff --git a/etc/etc.aviion/disktab b/etc/etc.aviion/disktab
index d973c8f5805..9fce6bfec2a 100644
--- a/etc/etc.aviion/disktab
+++ b/etc/etc.aviion/disktab
@@ -1,30 +1,5 @@
-#	$OpenBSD: disktab,v 1.1 2006/05/09 21:17:13 miod Exp $
+#	$OpenBSD: disktab,v 1.2 2010/07/02 20:33:54 tedu Exp $
 
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space
-# for bad sector tables unless the
-# device drivers fail to support this.
-#
-# Entries may also be used for other compatible drives
-# with the same geometry.
-
-#
 # XXX - Would like :ba#4096:fa#512: but that panics...
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
diff --git a/etc/etc.hp300/disktab b/etc/etc.hp300/disktab
index 5cd715ddc01..3002ba80b04 100644
--- a/etc/etc.hp300/disktab
+++ b/etc/etc.hp300/disktab
@@ -1,291 +1,7 @@
-#	$OpenBSD: disktab,v 1.7 2003/03/01 00:46:20 miod Exp $
-#	$NetBSD: disktab,v 1.3 1995/09/30 21:57:48 thorpej Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space
-# for bad sector tables unless the
-# device drivers fail to support this.
-#
-# Entries may also be used for other compatible drives
-# with the same geometry.
-
-#
-# HP CS80 Drives on hd (new style partitioning).  These mapping support
-# three basic layouts:
-#
-#	A/B/G:   This is the "traditional" setup for a bootable disk.
-#	         A is the root partition, B the swap, and G is for /usr
-#		 and users.
-#	A/D/E/F (large drives):
-#	A/D/H (small drives):
-#		 This is a setup for bootable systems requiring more swap
-#	         (e.g. those who need CL).  It has A as the root, D as a
-#	         larger swap, E and F (or H) as smaller user partitions.
-#		 E could  be used for /usr and F for users (or H for both).
-#	C:       This gives a single, non-bootable, large user filesystem.
-#	         Good for second drives on a machine as either /usr/src
-#		 or a large /usr or user partition.
+#	$OpenBSD: disktab,v 1.8 2010/07/02 20:33:54 tedu Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated: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:
 
-hd7945|hd7946|hd7945A|hd7946A|HP7945A|HP7946A:\
-	:ty=winchester:ns#16:nt#7:nc#968:\
-	:pa#15904:ba#8192:fa#1024:\
-	:pb#20160:\
-	:pc#108416:bc#4096:fc#1024:\
-	:pd#40320:\
-	:pg#72240:bg#4096:fg#512:\
-	:ph#52080:bh#4096:fh#512:
-hd7957|hd7957A|HP7957A:\
-	:ty=winchester:ns#22:nt#7:nc#1036:\
-	:pa#16016:ba#8192:fa#1024:\
-	:pb#24640:\
-	:pc#159544:bc#4096:fc#1024:\
-	:pd#42350:\
-	:pe#54824:be#4096:fe#512:\
-	:pf#46200:bf#4096:ff#1024:\
-	:pg#118734:bg#4096:fg#1024:\
-	:ph#101024:bh#4096:fh#1024:
-hd7958|hd7958A|HP7958A:\
-	:ty=winchester:ns#36:nt#7:nc#1013:\
-	:pa#16128:ba#8192:fa#1024:\
-	:pb#32256:\
-	:pc#255276:bc#4096:fc#1024:\
-	:pd#48384:\
-	:pe#100800:be#4096:fe#512:\
-	:pf#89712:bf#4096:ff#1024:\
-	:pg#206640:bg#4096:fg#1024:\
-	:ph#190512:bh#4096:fh#1024:
-hd7933|hd7933H|HP7933H:\
-	:ty=winchester:ns#46:nt#13:nc#1321:\
-	:pa#16146:ba#8192:fa#1024:\
-	:pb#66976:\
-	:pc#789958:bc#4096:fc#1024:\
-	:pd#16146:bd#8192:fd#1024:\
-	:pe#165646:be#4096:fe#1024:\
-	:pf#165646:bf#4096:ff#1024:\
-	:pg#706238:bg#4096:fg#1024:\
-	:ph#358800:bh#4096:fh#1024:
-hd7937|hd7937H|HP7937H:\
-	:ty=winchester:ns#123:nt#13:nc#698:\
-	:pa#15990:ba#8192:fa#1024:\
-	:pb#67158:\
-	:pc#1116102:bc#4096:fc#1024:\
-	:pd#15990:bd#8192:fd#1024:\
-	:pe#246246:be#4096:fe#1024:\
-	:pf#246246:bf#4096:ff#1024:\
-	:pg#1031355:bg#4096:fg#512:\
-	:ph#522873:bh#4096:fh#1024:
-hd9134|hd9134L|HP9134L:\
-	:ty=winchester:ns#16:nt#5:nc#973:\
-	:pa#15920:ba#8192:fa#1024:\
-	:pb#20000:\
-	:pc#77840:bc#4096:fc#1024\
-	:pd#32000:\
-	:pg#41840:bg#4096:fg#512:\
-	:ph#29840:bh#4096:fh#512:
-hd7936|hd7937H|HP7936H:\
-	:ty=winchester:ns#123:nt#7:nc#698:\
-	:pa#16359:ba#8192:fa#1024:\
-	:pb#67158:\
-	:pc#600978:bc#4096:fc#1024:\
-	:pd#16359:bd#8192:fd#1024:\
-	:pe#120540:be#4096:fe#1024:\
-	:pf#120540:bf#4096:ff#1024:\
-	:pg#516600:bg#4096:fg#512:\
-	:ph#259161:bh#4096:fh#1024
-hd7957B|HP7957B:\
-	:ty=winchester:ns#18:nt#7:nc#1269:\
-	:pa#16002:ba#8192:fa#1024:\
-	:pb#32760:\
-	:pc#159894:bc#4096:fc#1024:\
-	:pd#49140:\
-	:pe#50400:be#4096:fe#512:\
-	:pf#44226:bf#4096:ff#1024:\
-	:pg#111006:bg#4096:fg#1024:\
-	:ph#94626:bh#4096:fh#1024:
-hd7958B|hd7962|hd7962B|HP7958B|HP7962B:\
-	:ty=winchester:ns#42:nt#9:nc#786:\
-	:pa#16254:ba#8192:fa#1024:\
-	:pb#32886:\
-	:pc#297108:bc#4096:fc#1024:\
-	:pd#49140:\
-	:pe#121716:be#4096:fe#512:\
-	:pf#109620:bf#4096:ff#1024:\
-	:pg#247590:bg#4096:fg#1024:\
-	:ph#231336:bh#4096:fh#1024:
-hd7959B|hd7963|hd7963B|HP7959B|HP7963B:\
-	:ty=winchester:ns#42:nt#9:nc#1572:\
-	:pa#16254:ba#8192:fa#1024:\
-	:pb#49140:\
-	:pc#594216:bc#4096:fc#1024:\
-	:pd#65772:\
-	:pe#303912:be#4096:fe#512:\
-	:pf#207900:bf#4096:ff#1024:\
-	:pg#528444:bg#4096:fg#1024:\
-	:ph#511812:bh#4096:fh#1024:
-hd335H|hd335|HP2200A|2200A|HP335H|HP6000/335H:\
-	:ty=winchester:ns#113:nt#4:nc#1449:\
-	:pa#16272:ba#8192:fa#1024:\
-	:pb#49720:\
-	:pc#654948:bc#4096:fc#1024:\
-	:pd#65992:\
-	:pe#304648:be#4096:fe#512:\
-	:pf#267584:bf#4096:ff#1024:\
-	:pg#588504:bg#4096:fg#1024:\
-	:ph#572232:bh#4096:fh#1024:
-hd670H|hd670|HP2203A|2203A|HP670H|HP6000/670H:\
-	:ty=winchester:ns#113:nt#8:nc#1449:\
-	:pa#16272:ba#8192:fa#1024:\
-	:pb#67800:\
-	:pc#1309896:bc#4096:fc#1024:\
-	:pd#16272:\
-	:pe#305552:be#4096:fe#512:\
-	:pf#305552:bf#4096:ff#1024:\
-	:pg#1224920:bg#4096:fg#1024:\
-	:ph#597544:bh#4096:fh#1024:
-#
-# Utah derivatives
-#
-hd7937-utah|HP7937H with Utah partitions:\
-	:ty=winchester:ns#123:nt#13:nc#698:\
-	:pa#15990:ba#8192:fa#1024:\
-	:pb#67158:\
-	:pc#1116102:bc#4096:fc#1024:\
-	:pd#124722:bd#8192:fd#1024:\
-	:pe#163098:be#4096:fe#1024:\
-	:pf#287820:bf#4096:ff#1024:\
-	:pg#1031355:bg#4096:fg#512:\
-	:ph#455715:bh#4096:fh#1024:
-#
-# Antiques
-#
-hd9134D|HP9134D:\
-	:ty=winchester:ns#16:nt#6:nc#303:\
-	:pa#15936:ba#8192:fa#1024:\
-	:pb#13056:\
-	:pc#29088:bc#8192:fc#1024:
-hd9122|hd9122S|hd9122D|HP9122S|HP9122D:\
-	:ty=winchester:ns#8:nt#2:nc#77:\
-	:pc#1232:bc#8192:fc#1024:
-hd7912|hd7912P|HP7912P:\
-	:ty=winchester:ns#32:nt#7:nc#572:\
-	:pa#15904:ba#8192:fa#1024:\
-	:pb#22400:\
-	:pc#128128:bc#4096:fc#1024:\
-	:pd#42560:\
-	:pg#89600:bg#4096:fg#1024:\
-	:ph#69440:bh#4096:fh#1024:
-hd7914|hd7914P|hd7914CT|HP7914P|HP7914CT:\
-	:ty=winchester:ns#32:nt#7:nc#1152:\
-	:pa#15904:ba#8192:fa#1024:\
-	:pb#40320:\
-	:pc#258048:bc#4096:fc#1024:\
-	:pd#64960:\
-	:pe#98560:be#4096:fe#512:\
-	:pf#78400:bf#4096:ff#1024:\
-	:pg#201600:bg#4096:fg#1024:\
-	:ph#176960:bh#4096:fh#1024:
-#
-# SCSI disks
-# Again, these mapping support three basic layouts:
-# Again, these mapping support three basic layouts:
-#
-#	A/B/G:   This is the "traditional" setup for a bootable disk.
-#	         A is the root partition, B the swap, and G is for /usr
-#		 and users.
-#	A/D/E/F (large drives):
-#	A/D/H (small drives):
-#		 This is a setup for bootable systems requiring more swap
-#	         (e.g. those who need CL).  It has A as the root, D as a
-#	         larger swap, E and F (or H) as smaller user partitions.
-#		 E could  be used for /usr and F for users (or H for both).
-#		 Or, E could be used for /var and F for /usr and users.
-#	C:       This gives a single, non-bootable, large user filesystem.
-#	         Good for second drives on a machine as either /usr/src
-#		 or a large /usr or user partition.
-#
-#	A/B/G:   This is the "traditional" setup for a bootable disk.
-#	         A is the root partition, B the swap, and G is for /usr
-#		 and users.
-#	A/D/E/F (large drives):
-#	A/D/H (small drives):
-#		 This is a setup for bootable systems requiring more swap
-#	         (e.g. those who need CL).  It has A as the root, D as a
-#	         larger swap, E and F (or H) as smaller user partitions.
-#		 E could  be used for /usr and F for users (or H for both).
-#		 Or, E could be used for /var and F for /usr and users.
-#	C:       This gives a single, non-bootable, large user filesystem.
-#	         Good for second drives on a machine as either /usr/src
-#		 or a large /usr or user partition.
-#
-sd7958|sd7958-utah|HP7958S:\
-	:ty=winchester:ns#32:nt#6:nc#1643:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#315455:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#512:\
-	:pf#97343:of#218112:bf#4096:ff#1024:\
-	:pg#232511:og#82944:bg#8192:fg#1024:\
-	:ph#199743:oh#115712:bh#8192:fh#1024:
-sd7959|sd330|sd7959-utah|HP7959S:\
-	:ty=winchester:ns#32:nt#12:nc#1643:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#630911:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#512:\
-	:pf#412799:of#218112:bf#4096:ff#1024:\
-	:pg#547967:og#82944:bg#8192:fg#1024:\
-	:ph#515199:oh#115712:bh#8192:fh#1024:
-sd7548-utah|sd660|HP97548S with Utah partitions:\
-	:ty=winchester:ns#56:nt#16:nc#1447:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#1296511:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#512:\
-	:pf#1078399:of#218112:bf#4096:ff#1024:\
-	:pg#1213567:og#82944:bg#8192:fg#1024:\
-	:ph#1180799:oh#115712:bh#8192:fh#1024:
-#
-# HP magneto-optical drive.
-# (ns, nt, nc are totally bogus)
-# actually 1K sectors
-sd650-sony|mo650-sony|HP6300/650A Magneto-optical drive with Sony format:\
-	:ty=optical:ns#61:nt#8:nc#1306:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#637328:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#1024:\
-	:pf#419216:of#218112:bf#4096:ff#1024:\
-	:pg#554384:og#82944:bg#8192:fg#1024:
-sd650|mo650|mo650-ansi|HP6300/650A Magneto-optical with ANSI format drive:\
-	:ty=optical:ns#61:nt#8:nc#1306:\
-	:pa#16384:oa#1024:ba#8192:fa#1024:\
-	:pb#65536:ob#17408:\
-	:pc#629136:oc#0:bc#8192:fc#1024:\
-	:pd#98304:od#17408:\
-	:pe#102400:oe#115712:be#4096:fe#1024:\
-	:pf#411024:of#218112:bf#4096:ff#1024:\
-	:pg#546192:og#82944:bg#8192:fg#1024:
diff --git a/etc/etc.hppa/disktab b/etc/etc.hppa/disktab
index 847f7ace1ee..e661ab72a97 100644
--- a/etc/etc.hppa/disktab
+++ b/etc/etc.hppa/disktab
@@ -1,27 +1,4 @@
-#	$OpenBSD: disktab,v 1.6 2008/03/04 23:43:10 deraadt Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space
-# for bad sector tables unless the
-# device drivers fail to support this.
-#
-# Entries may also be used for other compatible drives
-# with the same geometry.
+#	$OpenBSD: disktab,v 1.7 2010/07/02 20:33:54 tedu Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated:se#512:nc#18:nt#2:ns#128:\
diff --git a/etc/etc.hppa64/disktab b/etc/etc.hppa64/disktab
index aa5750e3e58..b2725d5d435 100644
--- a/etc/etc.hppa64/disktab
+++ b/etc/etc.hppa64/disktab
@@ -1,27 +1,4 @@
-#	$OpenBSD: disktab,v 1.1 2005/04/01 16:02:16 deraadt Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space
-# for bad sector tables unless the
-# device drivers fail to support this.
-#
-# Entries may also be used for other compatible drives
-# with the same geometry.
+#	$OpenBSD: disktab,v 1.2 2010/07/02 20:33:54 tedu Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated:se#512:nc#20:nt#2:ns#128:\
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index 1054d1f2098..0de5a811cdc 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -1,78 +1,4 @@
-#	$OpenBSD: disktab,v 1.19 2006/10/04 01:04:22 krw Exp $
-
-# Disk geometry and partition layout tables.
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, ns*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-p]	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#	t[a-p]	partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
-
-qp120at|Quantum Peripherals 120MB IDE:\
-	:dt=ESDI:ty=winchester:se#512:nt#9:ns#32:nc#813: \
-	:pa#13824:oa#0:ta=4.2BSD:ba#4096:fa#512: \
-	:pb#13824:ob#13824:tb=swap: \
-	:pc#234144:oc#0: \
-	:ph#206496:oh#27648:th=4.2BSD:bh#4096:fh#512:
-
-pan60|Panasonic Laptop's 60MB IDE:\
-	:dt=ST506:ty=winchester:se#512:nt#13:ns#17:nc#565:\
-	:pa#13260:oa#0:ta=4.2BSD:ba#4096:fa#512:\
-	:pb#13260:ob#13260:tb=swap: \
-	:pc#124865:oc#0: \
-	:ph#97682:oh#26520:th=4.2BSD:bh#4096:fh#512:
-
-mk156|toshiba156|Toshiba MK156 156Mb:\
-	:dt=SCSI:ty=winchester:se#512:nt#10:ns#35:nc#825:\
-	:pa#15748:oa#0:ba#4096:fa#512:ta=4.2BSD:\
-	:pb#15748:ob#15748:tb=swap:\
-	:pc#288750:oc#0:\
-	:ph#257250:oh#31500:bh#4096:fh#512:th=4.2BSD:
-
-cp3100|Conner Peripherals 100MB IDE:\
-	:dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
-	:pa#12144:oa#0:ta=4.2BSD:ba#4096:fa#512: \
-	:pb#12144:ob#12144:tb=swap: \
-	:pc#202224:oc#0: \
-	:ph#177936:oh#24288:th=4.2BSD:bh#4096:fh#512:
-
-# a == root
-# b == swap
-# c == whole disk
-# e == /var
-# f == scratch
-# h == /usr
-
-cp3100new|Conner Peripherals 100MB IDE, with a different configuration:\
-	:dt=ST506:ty=winchester:se#512:nt#8:ns#33:nc#766: \
-	:pa#15840:oa#0:ta=4.2BSD:ba#4096:fa#512: \
-	:pb#24288:ob#15840:tb=swap: \
-	:pc#202224:oc#0: \
-	:pe#15840:oe#40128:te=4.2BSD:be#4096:fe#512: \
-	:pg#15840:og#55968:tg=4.2BSD:bg#4096:fg#512: \
-	:ph#130416:oh#71808:th=4.2BSD:bh#4096:fh#512:
+#	$OpenBSD: disktab,v 1.20 2010/07/02 20:33:54 tedu Exp $
 
 floppy288|3in|3.5in High Density Floppy, 2.88MB:\
 	:dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
@@ -92,39 +18,6 @@ floppy5|5in|5.25in High Density Floppy:\
 	:pb#2400:ob#0:bb#4096:fb#512:\
 	:pc#2400:oc#0:bc#4096:fc#512:
 
-maxtor4380|Maxtor XT4380E ESDI :\
-	:dt=ESDI:ty=winchester:se#512:nt#15:ns#36:nc#1222: \
-	:pa#21600:oa#0:ta=4.2BSD:ba#4096:\
-	:pb#21600:ob#21600:tb=swap: \
-	:pc#659880:oc#0: \
-	:pe#216000:oe#53200:te=4.2BSD:be#4096:fe#512: \
-	:ph#398520:oh#269200:th=4.2BSD:bh#4096:fh#512:
-
-miniscribe9380|compaq38|Miniscribe 9380 ESDI :\
-	:ty=winchester:dt=ESDI:se#512:nt#15:ns#35:nc#1223:rm#3600: \
-	:pa#21000:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
-	:pb#42000:ob#21000:tb=swap: \
-	:pc#642075:oc#0: \
-	:pe#21000:oe#63000:be#8192:fe#1024:te=4.2BSD: \
-	:ph#556500:oh#84000:bh#8192:fh#1024:th=4.2BSD:
-
-ida4|compaq88|Compaq IDA (4 drives) :\
-	:ty=winchester:dt=IDA:se#512:nt#16:ns#63:nc#1644:rm#3600:\
-	:pa#20160:oa#0:ba#8192:fa#1024:ta=4.2BSD: \
-	:pb#80640:ob#20160:tb=swap: \
-	:pc#1659168:oc#0: \
-	:pe#201600:oe#100800:be#8192:fe#1024:te=4.2BSD: \
-	:pf#20160:of#1310400:bf#8192:ff#1024:tf=4.2BSD: \
-	:ph#1008000:oh#302400:bh#8192:fh#1024:th=4.2BSD: \
-	:pg#302400:og#1330560:bg#4096:fg#512:tg=4.2BSD:
-
-fuji513|Fujitsu M22XXXX: \
-	:ty=winchester:dt=ESDI:se#512:nt#16:ns#63:nc#954:rm#3600:\
-	:pa#20160:oa#82656:ba#4096:fa#512:ta=4.2BSD: \
-	:pb#40320:ob#102816:tb=swap: \
-	:pc#961632:oc#0: \
-	:ph#656208:oh#143136:bh#4096:fh#512:th=4.2BSD:
-
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=ramdisk:se#512:nt#2:ns#128:nc#16:\
 	:pa#3800:oa#0:ta=4.2BSD:ba#4096:fa#512:\
diff --git a/etc/etc.landisk/disktab b/etc/etc.landisk/disktab
index b530281c5dc..3a64a1291da 100644
--- a/etc/etc.landisk/disktab
+++ b/etc/etc.landisk/disktab
@@ -1,22 +1,4 @@
-# $OpenBSD: disktab,v 1.2 2006/11/09 00:37:17 drahn Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#
-
+# $OpenBSD: disktab,v 1.3 2010/07/02 20:33:54 tedu Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
diff --git a/etc/etc.loongson/disktab b/etc/etc.loongson/disktab
index 1a278dcca3c..5e4098d0ff4 100644
--- a/etc/etc.loongson/disktab
+++ b/etc/etc.loongson/disktab
@@ -1,22 +1,4 @@
-# $OpenBSD: disktab,v 1.2 2010/02/16 18:02:15 otto Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-
+# $OpenBSD: disktab,v 1.3 2010/07/02 20:33:54 tedu Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
diff --git a/etc/etc.luna88k/disktab b/etc/etc.luna88k/disktab
index f2a29112635..9fce6bfec2a 100644
--- a/etc/etc.luna88k/disktab
+++ b/etc/etc.luna88k/disktab
@@ -1,30 +1,5 @@
-#	$OpenBSD: disktab,v 1.1 2004/04/21 18:23:44 miod Exp $
+#	$OpenBSD: disktab,v 1.2 2010/07/02 20:33:54 tedu Exp $
 
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space
-# for bad sector tables unless the
-# device drivers fail to support this.
-#
-# Entries may also be used for other compatible drives
-# with the same geometry.
-
-#
 # XXX - Would like :ba#4096:fa#512: but that panics...
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
diff --git a/etc/etc.mac68k/disktab b/etc/etc.mac68k/disktab
index 706bb4ec0a1..93bb0659cd0 100644
--- a/etc/etc.mac68k/disktab
+++ b/etc/etc.mac68k/disktab
@@ -1,28 +1,4 @@
-#	$OpenBSD: disktab,v 1.6 2003/03/01 00:46:23 miod Exp $
-#	$NetBSD: disktab,v 1.3 1995/09/30 21:57:48 thorpej Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space
-# for bad sector tables unless the
-# device drivers fail to support this.
-#
-# Entries may also be used for other compatible drives
-# with the same geometry.
+#	$OpenBSD: disktab,v 1.7 2010/07/02 20:33:54 tedu Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated:se#512:nc#45:nt#2:ns#32:\
diff --git a/etc/etc.macppc/disktab b/etc/etc.macppc/disktab
index f06df13d481..92289b560e1 100644
--- a/etc/etc.macppc/disktab
+++ b/etc/etc.macppc/disktab
@@ -1,22 +1,4 @@
-# $OpenBSD: disktab,v 1.3 2003/03/01 00:46:23 miod Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-
+# $OpenBSD: disktab,v 1.4 2010/07/02 20:33:54 tedu Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -35,834 +17,3 @@ floppy|floppy3|3in|3.5in High Density Floppy:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
-ASI-1.0GIBM:\
-	:ty#winchester:ns#80:nt#15:nc#1632:
-
-Arte DEC DSP3160S:\
-	:ty#winchester:ns#112:nt#16:nc#1744:
-
-CDC 9720-850:\
-	:ty#XD7053:ns#66:nt#15:nc#1358:
-
-CDC EMD 9720:\
-	:ty#XD7053:ns#48:nt#10:nc#1147:
-
-CDC EMD 9720-1230:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:
-
-CDC IPI 9720:\
-	:ty#ISP-80:ns#82:nt#15:nc#1631:\
-	:pa#33210:oa#0:ba#8192:\
-	:pb#131610:ob#33210:\
-	:pc#2006130:oc#0:\
-	:pg#196800:og#164820:\
-	:ph#1644510:oh#361620:
-
-CDC IPI 9722:\
-	:ty#ISP-80:ns#156:nt#7:nc#1630:\
-	:pa#33852:oa#0:ba#8192:\
-	:pb#132132:ob#33852:\
-	:pc#1779960:oc#0:\
-	:pg#197652:og#165984:\
-	:ph#1416324:oh#363636:
-
-CDC Wren IV 94171-344:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-CONNER 30170E:\
-	:ty#winchester:ns#46:nt#8:nc#897:\
-	:pa#14720:oa#0:ba#8192:\
-	:pb#40480:ob#14720:\
-	:pc#330096:oc#0:\
-	:pg#274896:og#55200:
-
-CONNER 30200:\
-	:ty#winchester:ns#49:nt#4:nc#2121:\
-	:pc#415716:oc#0:
-
-CONNER CFP4207S  4.28GB:\
-	:ty#winchester:ns#125:nt#20:nc#3353:\
-	:pc#8382500:oc#0:
-
-CONNER CP3500-540MB-3.5:\
-	:ty#winchester:ns#50:nt#12:nc#1768:\
-	:pc#1060800:oc#0:
-
-CP3100:\
-	:ty#winchester:ns#49:nt#4:nc#1023:\
-	:pc#204864:oc#0:
-
-Conner CFP1060:\
-	:ty#winchester:ns#111:nt#8:nc#2329:
-
-Conner CP3540:\
-	:ty#winchester:ns#49:nt#12:nc#1805:
-
-DEC DSP3107L:\
-	:ty#winchester:ns#83:nt#8:nc#3147:\
-	:pc#2089608:oc#0:
-
-DEC DSP3210 2 GB:\
-	:ty#winchester:ns#86:nt#16:nc#3040:\
-	:pc#4183040:oc#0:
-
-DEC DSP5200:\
-	:ty#winchester:ns#71:nt#21:nc#2619:\
-	:pa#32802:oa#0:ba#8192:\
-	:pb#65604:ob#32802:\
-	:pc#3904929:oc#0:\
-	:pg#3806523:og#98406:
-
-DEC DSP5350:\
-	:ty#winchester:ns#91:nt#25:nc#3053:
-
-DEC_RZ26:\
-	:ty#winchester:ns#57:nt#14:nc#2568:\
-	:pa#66234:oa#0:ba#8192:\
-	:pb#132468:ob#66234:\
-	:pc#2049264:oc#0:\
-	:pg#1850562:og#198702:
-
-DEC_RZ28:\
-	:ty#winchester:ns#84:nt#16:nc#3043:\
-	:pa#64512:oa#0:ba#8192:\
-	:pb#196224:ob#64512:\
-	:pc#4089792:oc#0:\
-	:pg#3827712:og#260736:
-
-DEC_RZ58:\
-	:ty#winchester:ns#85:nt#15:nc#2112:
-
-DEC_RZ58_whole_disk:\
-	:\
-	:pc#2692800:oc#0:
-
-DEC_RZ74:\
-	:ty#winchester:ns#91:nt#25:nc#3053:\
-	:pa#65975:oa#0:ba#8192:\
-	:pb#193375:ob#65975:\
-	:pc#4192825:oc#0:\
-	:pg#3931200:og#259350:\
-	:ph#2752750:oh#4192825:
-
-Fujitsu M2243AS:\
-	:ty#ACB4000:ns#17:nt#11:nc#752:
-
-Fujitsu M2246E:\
-	:ty#winchester:ns#35:nt#6:nc#1196:\
-	:pa#16170:oa#0:ba#8192:\
-	:pb#28140:ob#16170:\
-	:pc#251160:oc#0:\
-	:pg#206850:og#44310:
-
-Fujitsu M2263SA:\
-	:ty#winchester:ns#53:nt#15:nc#1652:
-
-Fujitsu M2266SA 1.2GB:\
-	:ty#winchester:ns#85:nt#15:nc#1652:
-
-Fujitsu M2266SA 1GB:\
-	:ty#winchester:ns#85:nt#15:nc#1642:
-
-Fujitsu M2344K:\
-	:ty#XD7053:ns#64:nt#27:nc#622:
-
-Fujitsu M2511A:\
-	:ty#winchester:ns#25:nt#1:nc#9950:
-
-Fujitsu M2512A small:\
-	:ty#winchester:ns#25:nt#1:nc#9950:\
-	:pc#248750:oc#0:
-
-Fujitsu M2512A v2:\
-	:ty#winchester:ns#25:nt#1:nc#17840:\
-	:pc#446000:oc#0:
-
-Fujitsu M2622SA:\
-	:ty#winchester:ns#64:nt#7:nc#1429:\
-	:pc#640192:oc#0:
-
-Fujitsu M2624FA:\
-	:ty#winchester:ns#64:nt#11:nc#1440:\
-	:pa#22528:oa#0:ba#8192:\
-	:pb#67584:ob#22528:\
-	:pc#1013760:oc#0:\
-	:pg#450560:og#90112:\
-	:ph#473088:oh#540672:
-
-Fujitsu M2652SA:\
-	:ty#winchester:ns#88:nt#20:nc#1935:
-
-Fujitsu M2654SA:\
-	:ty#winchester:ns#88:nt#21:nc#2174:
-
-Fujitsu M2684S:\
-	:ty#SCSI:ns#74:nt#6:nc#2338:
-
-Fujitsu-M2284/M2322:\
-	:ty#XY450:ns#32:nt#10:nc#821:
-
-Fujitsu-M2312K:\
-	:ty#XY450:ns#32:nt#7:nc#587:
-
-Fujitsu-M2333:\
-	:ty#XD7053:ns#67:nt#10:nc#821:
-
-Fujitsu-M2351 Eagle:\
-	:ty#XD7053:ns#46:nt#20:nc#840:
-
-Fujitsu-M2361 Eagle:\
-	:ty#XD7053:ns#67:nt#20:nc#840:
-
-Fujitsu-M2372K:\
-	:ty#XD7053:ns#67:nt#27:nc#743:
-
-Fujitsu-M2382:\
-	:ty#XD7053:ns#81:nt#27:nc#743:\
-	:pa#80919:oa#0:ba#8192:\
-	:pb#129033:ob#80919:\
-	:pc#1624941:oc#0:\
-	:pd#470205:od#209952:\
-	:pe#944784:oe#680157:\
-	:pf#209952:of#0:\
-	:pg#1414989:og#209952:\
-	:ph#1544022:oh#80919:
-
-Fujitsu-M2624S-512:\
-	:ty#winchester:ns#64:nt#11:nc#1429:
-
-Fujitsu-M2651SA:\
-	:ty#winchester:ns#88:nt#16:nc#1934:\
-	:pc#2723072:oc#0:
-
-Fujitsu-M2694ESA:\
-	:ty#winchester:ns#77:nt#15:nc#1830:
-
-HP 97549T:\
-	:ty#winchester:ns#64:nt#16:nc#1909:
-
-HP 97556:\
-	:ty#winchester:ns#72:nt#11:nc#1668:
-
-HP 97558:\
-	:ty#winchester:ns#72:nt#15:nc#1933:
-
-HP 97560:\
-	:ty#winchester:ns#72:nt#19:nc#1933:
-
-HP C2247 1.05GB:\
-	:ty#winchester:ns#95:nt#13:nc#1661:\
-	:pc#2051335:oc#0:\
-	:pg#1640080:og#0:\
-	:ph#411255:oh#1640080:
-
-HP C3010 / Cranel 2.0GB Fast SCSI2 H10:\
-	:ty#winchester:ns#95:nt#19:nc#2165:
-
-HP97548SU 664MB:\
-	:ty#winchester:ns#56:nt#16:nc#1445:\
-	:pa#35840:oa#0:ba#8192:\
-	:pb#71680:ob#35840:\
-	:pc#1294720:oc#0:\
-	:pg#197120:og#215040:\
-	:ph#342720:oh#609280:
-
-Hewlett Packard C2490A:\
-	:ty#winchester:ns#107:nt#18:nc#2159:
-
-Hewlett Packard C3323A:\
-	:ty#winchester:ns#98:nt#7:nc#2995:
-
-Hewlett Packard C3725S:\
-	:ty#winchester:ns#140:nt#9:nc#3362:\
-	:pc#4236120:oc#0:\
-	:ph#4193280:oh#1260:
-
-Hitachi DK315C-10:\
-	:ty#winchester:ns#75:nt#11:nc#2467:
-
-Hitachi DK315C-11:\
-	:ty#winchester:ns#58:nt#15:nc#2478:
-
-Hitachi DK315C-14:\
-	:ty#winchester:ns#75:nt#15:nc#2462:
-
-Hitachi DK326C-10:\
-	:ty#winchester:ns#87:nt#7:nc#3200:
-
-Hitachi DK326C-6:\
-	:ty#winchester:ns#87:nt#4:nc#3200:
-
-Hitachi DK515C-78:\
-	:ty#winchester:ns#69:nt#14:nc#1354:
-
-Hitachi DK516C-16:\
-	:ty#winchester:ns#80:nt#15:nc#2170:
-
-Hitachi DK517C-37:\
-	:ty#winchester:ns#81:nt#21:nc#3297:
-
-Hitachi DK815-10:\
-	:ty#XD7053:ns#67:nt#15:nc#1735:
-
-IBM 0662-S12:\
-	:ty#winchester:ns#114:nt#6:nc#3002:
-
-IBM 0662S12:\
-	:ty#winchester:ns#108:nt#5:nc#3803:
-
-IBM 0663-E15:\
-	:ty#winchester:ns#37:nt#20:nc#3182:
-
-IBM 0663L12:\
-	:ty#winchester:ns#66:nt#15:nc#1979:\
-	:pc#1959210:oc#0:
-
-IBM 0664-M1H/N1H:\
-	:ty#winchester:ns#86:nt#16:nc#2856:
-
-IBM 0664CSH:\
-	:ty#winchester:ns#125:nt#30:nc#2787:
-
-IBM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM DFHSS1x:\
-	:ty#winchester:ns#125:nt#4:nc#4383:
-
-IBM DFHSS2x:\
-	:ty#winchester:ns#125:nt#8:nc#4388:
-
-IBM DFHSS4x:\
-	:ty#winchester:ns#125:nt#16:nc#4390:
-
-IBM DPES-31080:\
-	:ty#winchester:ns#108:nt#4:nc#4901:\
-	:pc#2117232:oc#0:
-
-IBM DSAS-3270:\
-	:ty#winchester:ns#108:nt#2:nc#2542:
-
-IBM DSAS-3360:\
-	:ty#winchester:ns#108:nt#2:nc#3297:
-
-IBM DSAS-3540:\
-	:ty#winchester:ns#108:nt#3:nc#3259:
-
-IBM DSAS-3720:\
-	:ty#winchester:ns#108:nt#4:nc#3292:
-
-IBM OEM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM OEM DFHSS2F:\
-	:ty#winchester:ns#135:nt#8:nc#4076:\
-	:pa#4100760:oa#0:ba#8192:\
-	:pb#301320:ob#4100760:
-
-MAXOPTIX (NON-ISO, 1024b) DATA:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 1024b) SYSTEM:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 512b) DATA:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MAXOPTIX (NON-ISO, 512b) SYSTEM:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MICROP 4221-09MZ  10204:\
-	:ty#winchester:ns#139:nt#9:nc#3198:\
-	:pc#4000698:oc#0:
-
-MICROPOLIS 1991-27:\
-	:ty#winchester:ns#149:nt#27:nc#4400:
-
-MICROPOLIS 3243-19:\
-	:ty#winchester:ns#106:nt#19:nc#4139:
-
-MICROPOLIS 4110-09:\
-	:ty#winchester:ns#95:nt#9:nc#2283:
-
-Maxtor 7213SR NB:\
-	:ty#winchester:ns#65:nt#4:nc#1595:\
-	:pc#414700:oc#0:\
-	:pg#414700:og#0:
-
-Maxtor DXP3105S:\
-	:ty#winchester:ns#57:nt#14:nc#2568:
-
-Maxtor LXT-200S:\
-	:ty#winchester:ns#43:nt#7:nc#1117:
-
-Maxtor LXT-340SY:\
-	:ty#winchester:ns#70:nt#7:nc#1355:
-
-Maxtor LXT535ST:\
-	:ty#winchester:ns#61:nt#11:nc#1547:\
-	:pc#1038037:oc#0:
-
-Maxtor MXT1240S:\
-	:ty#winchester:ns#70:nt#15:nc#2306:\
-	:pc#2421300:oc#0:\
-	:pg#2421300:og#0:
-
-Maxtor P0-12S (1632):\
-	:ty#winchester:ns#90:nt#15:nc#1478:\
-	:pc#1995300:oc#0:\
-	:pg#1995300:og#0:
-
-Maxtor P0-12S (1795):\
-	:ty#winchester:ns#90:nt#15:nc#1510:\
-	:pc#2038500:oc#0:\
-	:pg#2038500:og#0:
-
-Maxtor P1-17S:\
-	:ty#winchester:ns#83:nt#19:nc#1816:\
-	:pa#78850:oa#0:ba#8192:\
-	:pb#78850:ob#78850:\
-	:pc#2863832:oc#0:\
-	:pd#78850:od#157700:\
-	:pg#2469582:og#236550:\
-	:ph#78850:oh#2706132:
-
-Maxtor P1-17S NB:\
-	:ty#winchester:ns#90:nt#19:nc#1711:\
-	:pc#2925810:oc#0:\
-	:pg#2925810:og#0:
-
-Maxtor XT-1050:\
-	:ty#ACB4000:ns#17:nt#5:nc#1020:
-
-Maxtor XT-3280S:\
-	:ty#winchester:ns#25:nt#15:nc#1222:
-
-Maxtor XT-4380S:\
-	:ty#winchester:ns#36:nt#15:nc#1202:
-
-Maxtor XT-8380S:\
-	:ty#winchester:ns#53:nt#8:nc#1626:
-
-Maxtor XT-8610E:\
-	:ty#winchester:ns#52:nt#12:nc#1626:
-
-Maxtor XT-8760E:\
-	:ty#winchester:ns#50:nt#15:nc#1616:\
-	:pa#97500:oa#0:ba#8192:\
-	:pb#63750:ob#658500:\
-	:pc#1212000:oc#0:\
-	:pd#280500:od#97500:\
-	:pe#280500:oe#378000:\
-	:pf#489750:of#722250:\
-	:pg#561000:og#97500:\
-	:ph#658500:oh#0:
-
-Maxtor XT-8760S:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-Micropolis 1304:\
-	:ty#ACB4000:ns#17:nt#6:nc#825:
-
-Micropolis 1325:\
-	:ty#ACB4000:ns#17:nt#8:nc#1022:
-
-Micropolis 1355:\
-	:ty#winchester:ns#34:nt#8:nc#1018:
-
-Micropolis 1528-15:\
-	:ty#winchester:ns#83:nt#15:nc#2102:\
-	:pa#32370:oa#0:ba#8192:\
-	:pb#64740:ob#32370:\
-	:pc#2616990:oc#0:\
-	:pg#2519880:og#97110:
-
-Micropolis 1548-15:\
-	:ty#winchester:ns#131:nt#15:nc#1701:\
-	:pa#33405:oa#0:ba#8192:\
-	:pb#66810:ob#33405:\
-	:pc#3342465:oc#0:\
-	:pg#3242250:og#100215:
-
-Micropolis 1558:\
-	:ty#winchester:ns#35:nt#15:nc#1218:
-
-Micropolis 1578-15:\
-	:ty#winchester:ns#35:nt#15:nc#1231:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#646275:oc#0:\
-	:pg#548625:og#97650:
-
-Micropolis 1588-15:\
-	:ty#winchester:ns#53:nt#15:nc#1637:\
-	:pa#32595:oa#0:ba#8192:\
-	:pb#65190:ob#32595:\
-	:pc#1301415:oc#0:\
-	:pg#1203630:og#97785:
-
-Micropolis 1598-15:\
-	:ty#winchester:ns#70:nt#15:nc#1931:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#2027550:oc#0:\
-	:pg#1929900:og#97650:
-
-Micropolis 1624-7:\
-	:ty#winchester:ns#114:nt#7:nc#1647:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#1314306:oc#0:\
-	:pg#1216152:og#98154:
-
-Micropolis 1674-7:\
-	:ty#winchester:ns#35:nt#7:nc#1255:\
-	:pa#16415:oa#0:ba#8192:\
-	:pb#32830:ob#16415:\
-	:pc#307475:oc#0:\
-	:pg#258230:og#49245:
-
-Micropolis 1684-7:\
-	:ty#winchester:ns#53:nt#7:nc#1785:\
-	:pa#32648:oa#0:ba#8192:\
-	:pb#65296:ob#32648:\
-	:pc#662235:oc#0:\
-	:pg#564291:og#97944:
-
-Micropolis 1908-15:\
-	:ty#winchester:ns#95:nt#15:nc#1890:\
-	:pa#32775:oa#0:ba#8192:\
-	:pb#65550:ob#32775:\
-	:pc#2693250:oc#0:\
-	:pg#2594925:og#98325:
-
-Micropolis 1924-21:\
-	:ty#winchester:ns#94:nt#21:nc#2072:\
-	:pa#33558:oa#0:ba#8192:\
-	:pb#67116:ob#33558:\
-	:pc#4090128:oc#0:\
-	:pg#3989454:og#100674:
-
-Micropolis 1926-15:\
-	:ty#winchester:ns#101:nt#15:nc#2769:\
-	:pa#33330:oa#0:ba#8192:\
-	:pb#66660:ob#33330:\
-	:pc#4195035:oc#0:\
-	:pg#4095045:og#99990:
-
-Micropolis 1936-21:\
-	:ty#winchester:ns#101:nt#21:nc#2772:\
-	:pa#33936:oa#0:ba#8192:\
-	:pb#67872:ob#33936:\
-	:pc#5879412:oc#0:\
-	:pg#2846382:og#101808:\
-	:ph#2931222:oh#2948190:
-
-Micropolis 2105-8:\
-	:ty#winchester:ns#94:nt#8:nc#1448:\
-	:pa#32336:oa#0:ba#8192:\
-	:pb#64672:ob#32336:\
-	:pc#1088896:oc#0:\
-	:pg#991888:og#97008:
-
-Micropolis 2108-10:\
-	:ty#winchester:ns#94:nt#10:nc#1450:\
-	:pa#31960:oa#0:ba#8192:\
-	:pb#63920:ob#31960:\
-	:pc#1363000:oc#0:\
-	:pg#1267120:og#95880:
-
-Micropolis 2112-15:\
-	:ty#winchester:ns#94:nt#15:nc#1452:\
-	:pa#33840:oa#0:ba#8192:\
-	:pb#67680:ob#33840:\
-	:pc#2047320:oc#0:\
-	:pg#1945800:og#101520:
-
-Micropolis 2205-05:\
-	:ty#winchester:ns#109:nt#5:nc#2088:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#1137960:oc#0:\
-	:pg#1039860:og#98100:
-
-Micropolis 2210-09:\
-	:ty#winchester:ns#109:nt#9:nc#2099:\
-	:pa#33354:oa#0:ba#8192:\
-	:pb#66708:ob#33354:\
-	:pc#2059119:oc#0:\
-	:pg#1959057:og#100062:
-
-Micropolis 2217-15:\
-	:ty#winchester:ns#109:nt#15:nc#2105:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#3441675:oc#0:\
-	:pg#3343575:og#98100:
-
-Micropolis 4110:\
-	:ty#winchester:ns#114:nt#9:nc#1998:
-
-Micropolis 4221:\
-	:ty#winchester:ns#109:nt#9:nc#4079:\
-	:pa#4001499:oa#0:ba#8192:\
-	:pc#4001499:oc#0:
-
-NEC D2363:\
-	:ty#XD7053:ns#67:nt#27:nc#964:
-
-NEC-D2352:\
-	:ty#XD7053:ns#57:nt#19:nc#758:
-
-QUANTUM EMPIRE_2100S:\
-	:ty#winchester:ns#137:nt#12:nc#2497:\
-	:pc#4105068:oc#0:
-
-QUANTUM LPS540S:\
-	:ty#winchester:ns#125:nt#4:nc#2113:
-
-QUANTUM PD1050iS:\
-	:ty#winchester:ns#92:nt#12:nc#1859:\
-	:pc#2052336:oc#0:
-
-QUANTUM XP34301:\
-	:ty#winchester:ns#118:nt#20:nc#3561:
-
-Quantum ELS 127S:\
-	:ty#winchester:ns#54:nt#3:nc#1541:
-
-Quantum ELS 170S:\
-	:ty#winchester:ns#54:nt#4:nc#1542:
-
-Quantum ELS 85S:\
-	:ty#winchester:ns#54:nt#2:nc#1535:
-
-Quantum Empire 1080S:\
-	:ty#winchester:ns#92:nt#16:nc#1431:
-
-Quantum Empire 540S:\
-	:ty#winchester:ns#92:nt#8:nc#1431:
-
-Quantum GoDrive 120S:\
-	:ty#winchester:ns#56:nt#4:nc#1067:
-
-Quantum GoDrive 160S:\
-	:ty#winchester:ns#58:nt#4:nc#1413:
-
-Quantum LPS 105S:\
-	:ty#winchester:ns#42:nt#4:nc#1221:
-
-Quantum LPS 120S:\
-	:ty#winchester:ns#60:nt#2:nc#1987:
-
-Quantum LPS 240S:\
-	:ty#winchester:ns#60:nt#4:nc#1995:
-
-Quantum LPS 270S:\
-	:ty#winchester:ns#76:nt#7:nc#992:
-
-Quantum LPS 525S:\
-	:ty#winchester:ns#70:nt#6:nc#2444:
-
-Quantum Lightning 730S:\
-	:ty#winchester:ns#63:nt#16:nc#1415:\
-	:pa#161280:oa#0:ba#8192:\
-	:pb#96768:ob#161280:\
-	:pc#1426320:oc#0:\
-	:pg#1168272:og#258048:
-
-Quantum PD 1050S:\
-	:ty#winchester:ns#70:nt#12:nc#2444:
-
-Quantum PD 120S:\
-	:ty#winchester:ns#42:nt#5:nc#1114:
-
-Quantum PD 1225S:\
-	:ty#winchester:ns#70:nt#14:nc#2442:
-
-Quantum PD 170S:\
-	:ty#winchester:ns#42:nt#7:nc#1117:
-
-Quantum PD 210S:\
-	:ty#winchester:ns#49:nt#7:nc#1189:
-
-Quantum PD 425S:\
-	:ty#winchester:ns#60:nt#9:nc#1540:
-
-Quantum PD 700S:\
-	:ty#winchester:ns#70:nt#8:nc#2441:
-
-Quantum ProDrive 80S:\
-	:ty#winchester:ns#34:nt#6:nc#832:
-
-Quantum XP32150:\
-	:ty#winchester:ns#109:nt#10:nc#3850:
-
-RICOH RO-5031E:\
-	:ty#winchester:ns#54:nt#15:nc#710:\
-	:pc#575100:oc#0:
-
-RZ24:\
-	:ty#winchester:ns#38:nt#8:nc#1344:\
-	:pc#409792:oc#0:
-
-RZ55:\
-	:ty#winchester:ns#35:nt#15:nc#1218:\
-	:pa#32025:oa#0:ba#8192:\
-	:pb#59850:ob#32025:\
-	:pc#639450:oc#0:\
-	:pg#547575:og#91875:
-
-SEAGATE ST11950N:\
-	:ty#winchester:ns#81:nt#15:nc#2715:\
-	:pc#3298725:oc#0:
-
-SEAGATE ST15230N:\
-	:ty#winchester:ns#111:nt#19:nc#3974:
-
-SEAGATE ST31200N:\
-	:ty#winchester:ns#85:nt#9:nc#2692:
-
-SEAGATE ST31230N:\
-	:ty#winchester:ns#104:nt#5:nc#3978:\
-	:pc#2068560:oc#0:
-
-SEAGATE ST32550N:\
-	:ty#winchester:ns#109:nt#11:nc#3495:\
-	:pc#4190505:oc#0:
-
-SEAGATE ST3600N:\
-	:ty#winchester:ns#79:nt#7:nc#1853:\
-	:pc#1024709:oc#0:
-
-ST83220K:\
-	:ty#"ISP-80":ns#102:nt#19:nc#2652:
-
-SUN0104:\
-	:ty#winchester:ns#35:nt#6:nc#974:
-
-SUN0121:\
-	:ty#winchester:ns#39:nt#4:nc#1520:
-
-SUN0207:\
-	:ty#winchester:ns#36:nt#9:nc#1254:
-
-SUN0327:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-SUN0424:\
-	:ty#winchester:ns#80:nt#9:nc#1151:
-
-SUN0535:\
-	:ty#winchester:ns#80:nt#7:nc#1866:
-
-SUN0669:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-SUN1.3G:\
-	:ty#winchester:ns#80:nt#17:nc#1965:
-
-SUN2.1G:\
-	:ty#winchester:ns#80:nt#19:nc#2733:
-
-Sabre ST82500J:\
-	:ty#XD7053:ns#82:nt#19:nc#2609:
-
-Seagate (CDC) Wren V 94181-702:\
-	:ty#winchester:ns#48:nt#15:nc#1543:
-
-Seagate (CDC) Wren VI 94191-766:\
-	:ty#winchester:ns#52:nt#15:nc#1659:
-
-Seagate (CDC) Wren VII 94601-1.2G SunOS 4.1.1:\
-	:ty#winchester:ns#70:nt#15:nc#1925:
-
-Seagate (CDC) Wren VII 94601-15:\
-	:ty#winchester:ns#71:nt#15:nc#1905:
-
-Seagate (CDC) Wren VIII ST41650N:\
-	:ty#winchester:ns#89:nt#15:nc#2070:
-
-Seagate Elite ST43400N-3.5G:\
-	:ty#winchester:ns#99:nt#21:nc#2736:\
-	:pa#2843360:oa#0:ba#8192:\
-	:pb#2843360:ob#2841993:
-
-Seagate IPI ZBR Elite:\
-	:ty#"ISP-80":ns#78:nt#17:nc#1893:\
-	:pa#34476:oa#0:ba#8192:\
-	:pb#132600:ob#34476:\
-	:pc#2510118:oc#0:\
-	:pg#663000:og#167076:\
-	:ph#1680042:oh#830076:
-
-Seagate ST11200N:\
-	:ty#winchester:ns#80:nt#15:nc#1714:\
-	:pa#2056800:oa#0:ba#8192:\
-	:pc#2056800:oc#0:
-
-Seagate ST11900N:\
-	:ty#winchester:ns#83:nt#15:nc#2619:\
-	:pb#498000:ob#0:\
-	:pc#3260655:oc#0:\
-	:ph#2761410:oh#498000:
-
-Seagate ST1239N SWIFT:\
-	:ty#winchester:ns#35:nt#9:nc#1264:
-
-Seagate ST12400N 2.4GB:\
-	:ty#winchester:ns#82:nt#19:nc#2668:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#4156744:oc#0:\
-	:pg#4058590:og#98154:
-
-Seagate ST12550N:\
-	:ty#winchester:ns#80:nt#19:nc#2747:
-
-Seagate ST1480N:\
-	:ty#winchester:ns#64:nt#9:nc#1456:
-
-Seagate ST15150N:\
-	:ty#winchester:ns#78:nt#21:nc#5119:\
-	:pc#8384922:oc#0:
-
-Seagate ST410800N Elite 9:\
-	:ty#winchester:ns#108:nt#27:nc#6087:\
-	:pc#17749692:oc#0:
-
-Seagate ST42100N - Wren 9:\
-	:ty#winchester:ns#96:nt#15:nc#2574:\
-	:pc#3706560:oc#0:
-
-Seagate ST42400N Elite 2:\
-	:ty#winchester:ns#84:nt#19:nc#2604:\
-	:pc#4155984:oc#0:
-
-Seagate Sabre-5 ST81236J:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:\
-	:pa#99630:oa#0:ba#8192:\
-	:pb#261990:ob#99630:\
-	:pc#2008590:oc#0:\
-	:pd#548580:od#361620:\
-	:pe#1098390:oe#910200:\
-	:pf#361620:of#0:\
-	:pg#1646970:og#361620:\
-	:ph#1908960:oh#99630:
-
-SeagateST3283N:\
-	:ty#winchester:ns#57:nt#5:nc#1689:
-
-Sun1.0G:\
-	:ty#winchester:ns#80:nt#15:nc#1703:
-
-SyQuest SQ555:\
-	:ty#winchester:ns#34:nt#2:nc#1273:\
-	:pc#86564:oc#0:
-
-Toshiba MK 156F:\
-	:ty#winchester:ns#34:nt#10:nc#815:
-
-Vertex V185:\
-	:ty#ACB4000:ns#17:nt#7:nc#1163:
-
diff --git a/etc/etc.mvme68k/disktab b/etc/etc.mvme68k/disktab
index 05c3723ba36..dc0247c821d 100644
--- a/etc/etc.mvme68k/disktab
+++ b/etc/etc.mvme68k/disktab
@@ -1,30 +1,5 @@
-#	$OpenBSD: disktab,v 1.7 2003/03/01 00:46:23 miod Exp $
+#	$OpenBSD: disktab,v 1.8 2010/07/02 20:33:54 tedu Exp $
 
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space
-# for bad sector tables unless the
-# device drivers fail to support this.
-#
-# Entries may also be used for other compatible drives
-# with the same geometry.
-
-#
 # XXX - Would like :ba#4096:fa#512: but that panics...
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
diff --git a/etc/etc.mvme88k/disktab b/etc/etc.mvme88k/disktab
index 17dbfc14b06..453aecc2203 100644
--- a/etc/etc.mvme88k/disktab
+++ b/etc/etc.mvme88k/disktab
@@ -1,30 +1,5 @@
-#	$OpenBSD: disktab,v 1.5 2003/08/07 21:06:24 miod Exp $
+#	$OpenBSD: disktab,v 1.6 2010/07/02 20:33:54 tedu Exp $
 
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-# All partition sizes contain space
-# for bad sector tables unless the
-# device drivers fail to support this.
-#
-# Entries may also be used for other compatible drives
-# with the same geometry.
-
-#
 # XXX - Would like :ba#4096:fa#512: but that panics...
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
diff --git a/etc/etc.mvmeppc/disktab b/etc/etc.mvmeppc/disktab
index f06df13d481..92289b560e1 100644
--- a/etc/etc.mvmeppc/disktab
+++ b/etc/etc.mvmeppc/disktab
@@ -1,22 +1,4 @@
-# $OpenBSD: disktab,v 1.3 2003/03/01 00:46:23 miod Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
-
+# $OpenBSD: disktab,v 1.4 2010/07/02 20:33:54 tedu Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -35,834 +17,3 @@ floppy|floppy3|3in|3.5in High Density Floppy:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
-ASI-1.0GIBM:\
-	:ty#winchester:ns#80:nt#15:nc#1632:
-
-Arte DEC DSP3160S:\
-	:ty#winchester:ns#112:nt#16:nc#1744:
-
-CDC 9720-850:\
-	:ty#XD7053:ns#66:nt#15:nc#1358:
-
-CDC EMD 9720:\
-	:ty#XD7053:ns#48:nt#10:nc#1147:
-
-CDC EMD 9720-1230:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:
-
-CDC IPI 9720:\
-	:ty#ISP-80:ns#82:nt#15:nc#1631:\
-	:pa#33210:oa#0:ba#8192:\
-	:pb#131610:ob#33210:\
-	:pc#2006130:oc#0:\
-	:pg#196800:og#164820:\
-	:ph#1644510:oh#361620:
-
-CDC IPI 9722:\
-	:ty#ISP-80:ns#156:nt#7:nc#1630:\
-	:pa#33852:oa#0:ba#8192:\
-	:pb#132132:ob#33852:\
-	:pc#1779960:oc#0:\
-	:pg#197652:og#165984:\
-	:ph#1416324:oh#363636:
-
-CDC Wren IV 94171-344:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-CONNER 30170E:\
-	:ty#winchester:ns#46:nt#8:nc#897:\
-	:pa#14720:oa#0:ba#8192:\
-	:pb#40480:ob#14720:\
-	:pc#330096:oc#0:\
-	:pg#274896:og#55200:
-
-CONNER 30200:\
-	:ty#winchester:ns#49:nt#4:nc#2121:\
-	:pc#415716:oc#0:
-
-CONNER CFP4207S  4.28GB:\
-	:ty#winchester:ns#125:nt#20:nc#3353:\
-	:pc#8382500:oc#0:
-
-CONNER CP3500-540MB-3.5:\
-	:ty#winchester:ns#50:nt#12:nc#1768:\
-	:pc#1060800:oc#0:
-
-CP3100:\
-	:ty#winchester:ns#49:nt#4:nc#1023:\
-	:pc#204864:oc#0:
-
-Conner CFP1060:\
-	:ty#winchester:ns#111:nt#8:nc#2329:
-
-Conner CP3540:\
-	:ty#winchester:ns#49:nt#12:nc#1805:
-
-DEC DSP3107L:\
-	:ty#winchester:ns#83:nt#8:nc#3147:\
-	:pc#2089608:oc#0:
-
-DEC DSP3210 2 GB:\
-	:ty#winchester:ns#86:nt#16:nc#3040:\
-	:pc#4183040:oc#0:
-
-DEC DSP5200:\
-	:ty#winchester:ns#71:nt#21:nc#2619:\
-	:pa#32802:oa#0:ba#8192:\
-	:pb#65604:ob#32802:\
-	:pc#3904929:oc#0:\
-	:pg#3806523:og#98406:
-
-DEC DSP5350:\
-	:ty#winchester:ns#91:nt#25:nc#3053:
-
-DEC_RZ26:\
-	:ty#winchester:ns#57:nt#14:nc#2568:\
-	:pa#66234:oa#0:ba#8192:\
-	:pb#132468:ob#66234:\
-	:pc#2049264:oc#0:\
-	:pg#1850562:og#198702:
-
-DEC_RZ28:\
-	:ty#winchester:ns#84:nt#16:nc#3043:\
-	:pa#64512:oa#0:ba#8192:\
-	:pb#196224:ob#64512:\
-	:pc#4089792:oc#0:\
-	:pg#3827712:og#260736:
-
-DEC_RZ58:\
-	:ty#winchester:ns#85:nt#15:nc#2112:
-
-DEC_RZ58_whole_disk:\
-	:\
-	:pc#2692800:oc#0:
-
-DEC_RZ74:\
-	:ty#winchester:ns#91:nt#25:nc#3053:\
-	:pa#65975:oa#0:ba#8192:\
-	:pb#193375:ob#65975:\
-	:pc#4192825:oc#0:\
-	:pg#3931200:og#259350:\
-	:ph#2752750:oh#4192825:
-
-Fujitsu M2243AS:\
-	:ty#ACB4000:ns#17:nt#11:nc#752:
-
-Fujitsu M2246E:\
-	:ty#winchester:ns#35:nt#6:nc#1196:\
-	:pa#16170:oa#0:ba#8192:\
-	:pb#28140:ob#16170:\
-	:pc#251160:oc#0:\
-	:pg#206850:og#44310:
-
-Fujitsu M2263SA:\
-	:ty#winchester:ns#53:nt#15:nc#1652:
-
-Fujitsu M2266SA 1.2GB:\
-	:ty#winchester:ns#85:nt#15:nc#1652:
-
-Fujitsu M2266SA 1GB:\
-	:ty#winchester:ns#85:nt#15:nc#1642:
-
-Fujitsu M2344K:\
-	:ty#XD7053:ns#64:nt#27:nc#622:
-
-Fujitsu M2511A:\
-	:ty#winchester:ns#25:nt#1:nc#9950:
-
-Fujitsu M2512A small:\
-	:ty#winchester:ns#25:nt#1:nc#9950:\
-	:pc#248750:oc#0:
-
-Fujitsu M2512A v2:\
-	:ty#winchester:ns#25:nt#1:nc#17840:\
-	:pc#446000:oc#0:
-
-Fujitsu M2622SA:\
-	:ty#winchester:ns#64:nt#7:nc#1429:\
-	:pc#640192:oc#0:
-
-Fujitsu M2624FA:\
-	:ty#winchester:ns#64:nt#11:nc#1440:\
-	:pa#22528:oa#0:ba#8192:\
-	:pb#67584:ob#22528:\
-	:pc#1013760:oc#0:\
-	:pg#450560:og#90112:\
-	:ph#473088:oh#540672:
-
-Fujitsu M2652SA:\
-	:ty#winchester:ns#88:nt#20:nc#1935:
-
-Fujitsu M2654SA:\
-	:ty#winchester:ns#88:nt#21:nc#2174:
-
-Fujitsu M2684S:\
-	:ty#SCSI:ns#74:nt#6:nc#2338:
-
-Fujitsu-M2284/M2322:\
-	:ty#XY450:ns#32:nt#10:nc#821:
-
-Fujitsu-M2312K:\
-	:ty#XY450:ns#32:nt#7:nc#587:
-
-Fujitsu-M2333:\
-	:ty#XD7053:ns#67:nt#10:nc#821:
-
-Fujitsu-M2351 Eagle:\
-	:ty#XD7053:ns#46:nt#20:nc#840:
-
-Fujitsu-M2361 Eagle:\
-	:ty#XD7053:ns#67:nt#20:nc#840:
-
-Fujitsu-M2372K:\
-	:ty#XD7053:ns#67:nt#27:nc#743:
-
-Fujitsu-M2382:\
-	:ty#XD7053:ns#81:nt#27:nc#743:\
-	:pa#80919:oa#0:ba#8192:\
-	:pb#129033:ob#80919:\
-	:pc#1624941:oc#0:\
-	:pd#470205:od#209952:\
-	:pe#944784:oe#680157:\
-	:pf#209952:of#0:\
-	:pg#1414989:og#209952:\
-	:ph#1544022:oh#80919:
-
-Fujitsu-M2624S-512:\
-	:ty#winchester:ns#64:nt#11:nc#1429:
-
-Fujitsu-M2651SA:\
-	:ty#winchester:ns#88:nt#16:nc#1934:\
-	:pc#2723072:oc#0:
-
-Fujitsu-M2694ESA:\
-	:ty#winchester:ns#77:nt#15:nc#1830:
-
-HP 97549T:\
-	:ty#winchester:ns#64:nt#16:nc#1909:
-
-HP 97556:\
-	:ty#winchester:ns#72:nt#11:nc#1668:
-
-HP 97558:\
-	:ty#winchester:ns#72:nt#15:nc#1933:
-
-HP 97560:\
-	:ty#winchester:ns#72:nt#19:nc#1933:
-
-HP C2247 1.05GB:\
-	:ty#winchester:ns#95:nt#13:nc#1661:\
-	:pc#2051335:oc#0:\
-	:pg#1640080:og#0:\
-	:ph#411255:oh#1640080:
-
-HP C3010 / Cranel 2.0GB Fast SCSI2 H10:\
-	:ty#winchester:ns#95:nt#19:nc#2165:
-
-HP97548SU 664MB:\
-	:ty#winchester:ns#56:nt#16:nc#1445:\
-	:pa#35840:oa#0:ba#8192:\
-	:pb#71680:ob#35840:\
-	:pc#1294720:oc#0:\
-	:pg#197120:og#215040:\
-	:ph#342720:oh#609280:
-
-Hewlett Packard C2490A:\
-	:ty#winchester:ns#107:nt#18:nc#2159:
-
-Hewlett Packard C3323A:\
-	:ty#winchester:ns#98:nt#7:nc#2995:
-
-Hewlett Packard C3725S:\
-	:ty#winchester:ns#140:nt#9:nc#3362:\
-	:pc#4236120:oc#0:\
-	:ph#4193280:oh#1260:
-
-Hitachi DK315C-10:\
-	:ty#winchester:ns#75:nt#11:nc#2467:
-
-Hitachi DK315C-11:\
-	:ty#winchester:ns#58:nt#15:nc#2478:
-
-Hitachi DK315C-14:\
-	:ty#winchester:ns#75:nt#15:nc#2462:
-
-Hitachi DK326C-10:\
-	:ty#winchester:ns#87:nt#7:nc#3200:
-
-Hitachi DK326C-6:\
-	:ty#winchester:ns#87:nt#4:nc#3200:
-
-Hitachi DK515C-78:\
-	:ty#winchester:ns#69:nt#14:nc#1354:
-
-Hitachi DK516C-16:\
-	:ty#winchester:ns#80:nt#15:nc#2170:
-
-Hitachi DK517C-37:\
-	:ty#winchester:ns#81:nt#21:nc#3297:
-
-Hitachi DK815-10:\
-	:ty#XD7053:ns#67:nt#15:nc#1735:
-
-IBM 0662-S12:\
-	:ty#winchester:ns#114:nt#6:nc#3002:
-
-IBM 0662S12:\
-	:ty#winchester:ns#108:nt#5:nc#3803:
-
-IBM 0663-E15:\
-	:ty#winchester:ns#37:nt#20:nc#3182:
-
-IBM 0663L12:\
-	:ty#winchester:ns#66:nt#15:nc#1979:\
-	:pc#1959210:oc#0:
-
-IBM 0664-M1H/N1H:\
-	:ty#winchester:ns#86:nt#16:nc#2856:
-
-IBM 0664CSH:\
-	:ty#winchester:ns#125:nt#30:nc#2787:
-
-IBM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM DFHSS1x:\
-	:ty#winchester:ns#125:nt#4:nc#4383:
-
-IBM DFHSS2x:\
-	:ty#winchester:ns#125:nt#8:nc#4388:
-
-IBM DFHSS4x:\
-	:ty#winchester:ns#125:nt#16:nc#4390:
-
-IBM DPES-31080:\
-	:ty#winchester:ns#108:nt#4:nc#4901:\
-	:pc#2117232:oc#0:
-
-IBM DSAS-3270:\
-	:ty#winchester:ns#108:nt#2:nc#2542:
-
-IBM DSAS-3360:\
-	:ty#winchester:ns#108:nt#2:nc#3297:
-
-IBM DSAS-3540:\
-	:ty#winchester:ns#108:nt#3:nc#3259:
-
-IBM DSAS-3720:\
-	:ty#winchester:ns#108:nt#4:nc#3292:
-
-IBM OEM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM OEM DFHSS2F:\
-	:ty#winchester:ns#135:nt#8:nc#4076:\
-	:pa#4100760:oa#0:ba#8192:\
-	:pb#301320:ob#4100760:
-
-MAXOPTIX (NON-ISO, 1024b) DATA:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 1024b) SYSTEM:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 512b) DATA:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MAXOPTIX (NON-ISO, 512b) SYSTEM:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MICROP 4221-09MZ  10204:\
-	:ty#winchester:ns#139:nt#9:nc#3198:\
-	:pc#4000698:oc#0:
-
-MICROPOLIS 1991-27:\
-	:ty#winchester:ns#149:nt#27:nc#4400:
-
-MICROPOLIS 3243-19:\
-	:ty#winchester:ns#106:nt#19:nc#4139:
-
-MICROPOLIS 4110-09:\
-	:ty#winchester:ns#95:nt#9:nc#2283:
-
-Maxtor 7213SR NB:\
-	:ty#winchester:ns#65:nt#4:nc#1595:\
-	:pc#414700:oc#0:\
-	:pg#414700:og#0:
-
-Maxtor DXP3105S:\
-	:ty#winchester:ns#57:nt#14:nc#2568:
-
-Maxtor LXT-200S:\
-	:ty#winchester:ns#43:nt#7:nc#1117:
-
-Maxtor LXT-340SY:\
-	:ty#winchester:ns#70:nt#7:nc#1355:
-
-Maxtor LXT535ST:\
-	:ty#winchester:ns#61:nt#11:nc#1547:\
-	:pc#1038037:oc#0:
-
-Maxtor MXT1240S:\
-	:ty#winchester:ns#70:nt#15:nc#2306:\
-	:pc#2421300:oc#0:\
-	:pg#2421300:og#0:
-
-Maxtor P0-12S (1632):\
-	:ty#winchester:ns#90:nt#15:nc#1478:\
-	:pc#1995300:oc#0:\
-	:pg#1995300:og#0:
-
-Maxtor P0-12S (1795):\
-	:ty#winchester:ns#90:nt#15:nc#1510:\
-	:pc#2038500:oc#0:\
-	:pg#2038500:og#0:
-
-Maxtor P1-17S:\
-	:ty#winchester:ns#83:nt#19:nc#1816:\
-	:pa#78850:oa#0:ba#8192:\
-	:pb#78850:ob#78850:\
-	:pc#2863832:oc#0:\
-	:pd#78850:od#157700:\
-	:pg#2469582:og#236550:\
-	:ph#78850:oh#2706132:
-
-Maxtor P1-17S NB:\
-	:ty#winchester:ns#90:nt#19:nc#1711:\
-	:pc#2925810:oc#0:\
-	:pg#2925810:og#0:
-
-Maxtor XT-1050:\
-	:ty#ACB4000:ns#17:nt#5:nc#1020:
-
-Maxtor XT-3280S:\
-	:ty#winchester:ns#25:nt#15:nc#1222:
-
-Maxtor XT-4380S:\
-	:ty#winchester:ns#36:nt#15:nc#1202:
-
-Maxtor XT-8380S:\
-	:ty#winchester:ns#53:nt#8:nc#1626:
-
-Maxtor XT-8610E:\
-	:ty#winchester:ns#52:nt#12:nc#1626:
-
-Maxtor XT-8760E:\
-	:ty#winchester:ns#50:nt#15:nc#1616:\
-	:pa#97500:oa#0:ba#8192:\
-	:pb#63750:ob#658500:\
-	:pc#1212000:oc#0:\
-	:pd#280500:od#97500:\
-	:pe#280500:oe#378000:\
-	:pf#489750:of#722250:\
-	:pg#561000:og#97500:\
-	:ph#658500:oh#0:
-
-Maxtor XT-8760S:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-Micropolis 1304:\
-	:ty#ACB4000:ns#17:nt#6:nc#825:
-
-Micropolis 1325:\
-	:ty#ACB4000:ns#17:nt#8:nc#1022:
-
-Micropolis 1355:\
-	:ty#winchester:ns#34:nt#8:nc#1018:
-
-Micropolis 1528-15:\
-	:ty#winchester:ns#83:nt#15:nc#2102:\
-	:pa#32370:oa#0:ba#8192:\
-	:pb#64740:ob#32370:\
-	:pc#2616990:oc#0:\
-	:pg#2519880:og#97110:
-
-Micropolis 1548-15:\
-	:ty#winchester:ns#131:nt#15:nc#1701:\
-	:pa#33405:oa#0:ba#8192:\
-	:pb#66810:ob#33405:\
-	:pc#3342465:oc#0:\
-	:pg#3242250:og#100215:
-
-Micropolis 1558:\
-	:ty#winchester:ns#35:nt#15:nc#1218:
-
-Micropolis 1578-15:\
-	:ty#winchester:ns#35:nt#15:nc#1231:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#646275:oc#0:\
-	:pg#548625:og#97650:
-
-Micropolis 1588-15:\
-	:ty#winchester:ns#53:nt#15:nc#1637:\
-	:pa#32595:oa#0:ba#8192:\
-	:pb#65190:ob#32595:\
-	:pc#1301415:oc#0:\
-	:pg#1203630:og#97785:
-
-Micropolis 1598-15:\
-	:ty#winchester:ns#70:nt#15:nc#1931:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#2027550:oc#0:\
-	:pg#1929900:og#97650:
-
-Micropolis 1624-7:\
-	:ty#winchester:ns#114:nt#7:nc#1647:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#1314306:oc#0:\
-	:pg#1216152:og#98154:
-
-Micropolis 1674-7:\
-	:ty#winchester:ns#35:nt#7:nc#1255:\
-	:pa#16415:oa#0:ba#8192:\
-	:pb#32830:ob#16415:\
-	:pc#307475:oc#0:\
-	:pg#258230:og#49245:
-
-Micropolis 1684-7:\
-	:ty#winchester:ns#53:nt#7:nc#1785:\
-	:pa#32648:oa#0:ba#8192:\
-	:pb#65296:ob#32648:\
-	:pc#662235:oc#0:\
-	:pg#564291:og#97944:
-
-Micropolis 1908-15:\
-	:ty#winchester:ns#95:nt#15:nc#1890:\
-	:pa#32775:oa#0:ba#8192:\
-	:pb#65550:ob#32775:\
-	:pc#2693250:oc#0:\
-	:pg#2594925:og#98325:
-
-Micropolis 1924-21:\
-	:ty#winchester:ns#94:nt#21:nc#2072:\
-	:pa#33558:oa#0:ba#8192:\
-	:pb#67116:ob#33558:\
-	:pc#4090128:oc#0:\
-	:pg#3989454:og#100674:
-
-Micropolis 1926-15:\
-	:ty#winchester:ns#101:nt#15:nc#2769:\
-	:pa#33330:oa#0:ba#8192:\
-	:pb#66660:ob#33330:\
-	:pc#4195035:oc#0:\
-	:pg#4095045:og#99990:
-
-Micropolis 1936-21:\
-	:ty#winchester:ns#101:nt#21:nc#2772:\
-	:pa#33936:oa#0:ba#8192:\
-	:pb#67872:ob#33936:\
-	:pc#5879412:oc#0:\
-	:pg#2846382:og#101808:\
-	:ph#2931222:oh#2948190:
-
-Micropolis 2105-8:\
-	:ty#winchester:ns#94:nt#8:nc#1448:\
-	:pa#32336:oa#0:ba#8192:\
-	:pb#64672:ob#32336:\
-	:pc#1088896:oc#0:\
-	:pg#991888:og#97008:
-
-Micropolis 2108-10:\
-	:ty#winchester:ns#94:nt#10:nc#1450:\
-	:pa#31960:oa#0:ba#8192:\
-	:pb#63920:ob#31960:\
-	:pc#1363000:oc#0:\
-	:pg#1267120:og#95880:
-
-Micropolis 2112-15:\
-	:ty#winchester:ns#94:nt#15:nc#1452:\
-	:pa#33840:oa#0:ba#8192:\
-	:pb#67680:ob#33840:\
-	:pc#2047320:oc#0:\
-	:pg#1945800:og#101520:
-
-Micropolis 2205-05:\
-	:ty#winchester:ns#109:nt#5:nc#2088:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#1137960:oc#0:\
-	:pg#1039860:og#98100:
-
-Micropolis 2210-09:\
-	:ty#winchester:ns#109:nt#9:nc#2099:\
-	:pa#33354:oa#0:ba#8192:\
-	:pb#66708:ob#33354:\
-	:pc#2059119:oc#0:\
-	:pg#1959057:og#100062:
-
-Micropolis 2217-15:\
-	:ty#winchester:ns#109:nt#15:nc#2105:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#3441675:oc#0:\
-	:pg#3343575:og#98100:
-
-Micropolis 4110:\
-	:ty#winchester:ns#114:nt#9:nc#1998:
-
-Micropolis 4221:\
-	:ty#winchester:ns#109:nt#9:nc#4079:\
-	:pa#4001499:oa#0:ba#8192:\
-	:pc#4001499:oc#0:
-
-NEC D2363:\
-	:ty#XD7053:ns#67:nt#27:nc#964:
-
-NEC-D2352:\
-	:ty#XD7053:ns#57:nt#19:nc#758:
-
-QUANTUM EMPIRE_2100S:\
-	:ty#winchester:ns#137:nt#12:nc#2497:\
-	:pc#4105068:oc#0:
-
-QUANTUM LPS540S:\
-	:ty#winchester:ns#125:nt#4:nc#2113:
-
-QUANTUM PD1050iS:\
-	:ty#winchester:ns#92:nt#12:nc#1859:\
-	:pc#2052336:oc#0:
-
-QUANTUM XP34301:\
-	:ty#winchester:ns#118:nt#20:nc#3561:
-
-Quantum ELS 127S:\
-	:ty#winchester:ns#54:nt#3:nc#1541:
-
-Quantum ELS 170S:\
-	:ty#winchester:ns#54:nt#4:nc#1542:
-
-Quantum ELS 85S:\
-	:ty#winchester:ns#54:nt#2:nc#1535:
-
-Quantum Empire 1080S:\
-	:ty#winchester:ns#92:nt#16:nc#1431:
-
-Quantum Empire 540S:\
-	:ty#winchester:ns#92:nt#8:nc#1431:
-
-Quantum GoDrive 120S:\
-	:ty#winchester:ns#56:nt#4:nc#1067:
-
-Quantum GoDrive 160S:\
-	:ty#winchester:ns#58:nt#4:nc#1413:
-
-Quantum LPS 105S:\
-	:ty#winchester:ns#42:nt#4:nc#1221:
-
-Quantum LPS 120S:\
-	:ty#winchester:ns#60:nt#2:nc#1987:
-
-Quantum LPS 240S:\
-	:ty#winchester:ns#60:nt#4:nc#1995:
-
-Quantum LPS 270S:\
-	:ty#winchester:ns#76:nt#7:nc#992:
-
-Quantum LPS 525S:\
-	:ty#winchester:ns#70:nt#6:nc#2444:
-
-Quantum Lightning 730S:\
-	:ty#winchester:ns#63:nt#16:nc#1415:\
-	:pa#161280:oa#0:ba#8192:\
-	:pb#96768:ob#161280:\
-	:pc#1426320:oc#0:\
-	:pg#1168272:og#258048:
-
-Quantum PD 1050S:\
-	:ty#winchester:ns#70:nt#12:nc#2444:
-
-Quantum PD 120S:\
-	:ty#winchester:ns#42:nt#5:nc#1114:
-
-Quantum PD 1225S:\
-	:ty#winchester:ns#70:nt#14:nc#2442:
-
-Quantum PD 170S:\
-	:ty#winchester:ns#42:nt#7:nc#1117:
-
-Quantum PD 210S:\
-	:ty#winchester:ns#49:nt#7:nc#1189:
-
-Quantum PD 425S:\
-	:ty#winchester:ns#60:nt#9:nc#1540:
-
-Quantum PD 700S:\
-	:ty#winchester:ns#70:nt#8:nc#2441:
-
-Quantum ProDrive 80S:\
-	:ty#winchester:ns#34:nt#6:nc#832:
-
-Quantum XP32150:\
-	:ty#winchester:ns#109:nt#10:nc#3850:
-
-RICOH RO-5031E:\
-	:ty#winchester:ns#54:nt#15:nc#710:\
-	:pc#575100:oc#0:
-
-RZ24:\
-	:ty#winchester:ns#38:nt#8:nc#1344:\
-	:pc#409792:oc#0:
-
-RZ55:\
-	:ty#winchester:ns#35:nt#15:nc#1218:\
-	:pa#32025:oa#0:ba#8192:\
-	:pb#59850:ob#32025:\
-	:pc#639450:oc#0:\
-	:pg#547575:og#91875:
-
-SEAGATE ST11950N:\
-	:ty#winchester:ns#81:nt#15:nc#2715:\
-	:pc#3298725:oc#0:
-
-SEAGATE ST15230N:\
-	:ty#winchester:ns#111:nt#19:nc#3974:
-
-SEAGATE ST31200N:\
-	:ty#winchester:ns#85:nt#9:nc#2692:
-
-SEAGATE ST31230N:\
-	:ty#winchester:ns#104:nt#5:nc#3978:\
-	:pc#2068560:oc#0:
-
-SEAGATE ST32550N:\
-	:ty#winchester:ns#109:nt#11:nc#3495:\
-	:pc#4190505:oc#0:
-
-SEAGATE ST3600N:\
-	:ty#winchester:ns#79:nt#7:nc#1853:\
-	:pc#1024709:oc#0:
-
-ST83220K:\
-	:ty#"ISP-80":ns#102:nt#19:nc#2652:
-
-SUN0104:\
-	:ty#winchester:ns#35:nt#6:nc#974:
-
-SUN0121:\
-	:ty#winchester:ns#39:nt#4:nc#1520:
-
-SUN0207:\
-	:ty#winchester:ns#36:nt#9:nc#1254:
-
-SUN0327:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-SUN0424:\
-	:ty#winchester:ns#80:nt#9:nc#1151:
-
-SUN0535:\
-	:ty#winchester:ns#80:nt#7:nc#1866:
-
-SUN0669:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-SUN1.3G:\
-	:ty#winchester:ns#80:nt#17:nc#1965:
-
-SUN2.1G:\
-	:ty#winchester:ns#80:nt#19:nc#2733:
-
-Sabre ST82500J:\
-	:ty#XD7053:ns#82:nt#19:nc#2609:
-
-Seagate (CDC) Wren V 94181-702:\
-	:ty#winchester:ns#48:nt#15:nc#1543:
-
-Seagate (CDC) Wren VI 94191-766:\
-	:ty#winchester:ns#52:nt#15:nc#1659:
-
-Seagate (CDC) Wren VII 94601-1.2G SunOS 4.1.1:\
-	:ty#winchester:ns#70:nt#15:nc#1925:
-
-Seagate (CDC) Wren VII 94601-15:\
-	:ty#winchester:ns#71:nt#15:nc#1905:
-
-Seagate (CDC) Wren VIII ST41650N:\
-	:ty#winchester:ns#89:nt#15:nc#2070:
-
-Seagate Elite ST43400N-3.5G:\
-	:ty#winchester:ns#99:nt#21:nc#2736:\
-	:pa#2843360:oa#0:ba#8192:\
-	:pb#2843360:ob#2841993:
-
-Seagate IPI ZBR Elite:\
-	:ty#"ISP-80":ns#78:nt#17:nc#1893:\
-	:pa#34476:oa#0:ba#8192:\
-	:pb#132600:ob#34476:\
-	:pc#2510118:oc#0:\
-	:pg#663000:og#167076:\
-	:ph#1680042:oh#830076:
-
-Seagate ST11200N:\
-	:ty#winchester:ns#80:nt#15:nc#1714:\
-	:pa#2056800:oa#0:ba#8192:\
-	:pc#2056800:oc#0:
-
-Seagate ST11900N:\
-	:ty#winchester:ns#83:nt#15:nc#2619:\
-	:pb#498000:ob#0:\
-	:pc#3260655:oc#0:\
-	:ph#2761410:oh#498000:
-
-Seagate ST1239N SWIFT:\
-	:ty#winchester:ns#35:nt#9:nc#1264:
-
-Seagate ST12400N 2.4GB:\
-	:ty#winchester:ns#82:nt#19:nc#2668:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#4156744:oc#0:\
-	:pg#4058590:og#98154:
-
-Seagate ST12550N:\
-	:ty#winchester:ns#80:nt#19:nc#2747:
-
-Seagate ST1480N:\
-	:ty#winchester:ns#64:nt#9:nc#1456:
-
-Seagate ST15150N:\
-	:ty#winchester:ns#78:nt#21:nc#5119:\
-	:pc#8384922:oc#0:
-
-Seagate ST410800N Elite 9:\
-	:ty#winchester:ns#108:nt#27:nc#6087:\
-	:pc#17749692:oc#0:
-
-Seagate ST42100N - Wren 9:\
-	:ty#winchester:ns#96:nt#15:nc#2574:\
-	:pc#3706560:oc#0:
-
-Seagate ST42400N Elite 2:\
-	:ty#winchester:ns#84:nt#19:nc#2604:\
-	:pc#4155984:oc#0:
-
-Seagate Sabre-5 ST81236J:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:\
-	:pa#99630:oa#0:ba#8192:\
-	:pb#261990:ob#99630:\
-	:pc#2008590:oc#0:\
-	:pd#548580:od#361620:\
-	:pe#1098390:oe#910200:\
-	:pf#361620:of#0:\
-	:pg#1646970:og#361620:\
-	:ph#1908960:oh#99630:
-
-SeagateST3283N:\
-	:ty#winchester:ns#57:nt#5:nc#1689:
-
-Sun1.0G:\
-	:ty#winchester:ns#80:nt#15:nc#1703:
-
-SyQuest SQ555:\
-	:ty#winchester:ns#34:nt#2:nc#1273:\
-	:pc#86564:oc#0:
-
-Toshiba MK 156F:\
-	:ty#winchester:ns#34:nt#10:nc#815:
-
-Vertex V185:\
-	:ty#ACB4000:ns#17:nt#7:nc#1163:
-
diff --git a/etc/etc.palm/disktab b/etc/etc.palm/disktab
index 5ca7bb91ff0..abc4580e430 100644
--- a/etc/etc.palm/disktab
+++ b/etc/etc.palm/disktab
@@ -1,22 +1,4 @@
-# $OpenBSD: disktab,v 1.1 2009/09/05 02:19:09 marex Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#
-
+# $OpenBSD: disktab,v 1.2 2010/07/02 20:33:54 tedu Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -42,834 +24,3 @@ floppy|floppy3|3in|3.5in High Density Floppy:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
-ASI-1.0GIBM:\
-	:ty#winchester:ns#80:nt#15:nc#1632:
-
-Arte DEC DSP3160S:\
-	:ty#winchester:ns#112:nt#16:nc#1744:
-
-CDC 9720-850:\
-	:ty#XD7053:ns#66:nt#15:nc#1358:
-
-CDC EMD 9720:\
-	:ty#XD7053:ns#48:nt#10:nc#1147:
-
-CDC EMD 9720-1230:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:
-
-CDC IPI 9720:\
-	:ty#ISP-80:ns#82:nt#15:nc#1631:\
-	:pa#33210:oa#0:ba#8192:\
-	:pb#131610:ob#33210:\
-	:pc#2006130:oc#0:\
-	:pg#196800:og#164820:\
-	:ph#1644510:oh#361620:
-
-CDC IPI 9722:\
-	:ty#ISP-80:ns#156:nt#7:nc#1630:\
-	:pa#33852:oa#0:ba#8192:\
-	:pb#132132:ob#33852:\
-	:pc#1779960:oc#0:\
-	:pg#197652:og#165984:\
-	:ph#1416324:oh#363636:
-
-CDC Wren IV 94171-344:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-CONNER 30170E:\
-	:ty#winchester:ns#46:nt#8:nc#897:\
-	:pa#14720:oa#0:ba#8192:\
-	:pb#40480:ob#14720:\
-	:pc#330096:oc#0:\
-	:pg#274896:og#55200:
-
-CONNER 30200:\
-	:ty#winchester:ns#49:nt#4:nc#2121:\
-	:pc#415716:oc#0:
-
-CONNER CFP4207S  4.28GB:\
-	:ty#winchester:ns#125:nt#20:nc#3353:\
-	:pc#8382500:oc#0:
-
-CONNER CP3500-540MB-3.5:\
-	:ty#winchester:ns#50:nt#12:nc#1768:\
-	:pc#1060800:oc#0:
-
-CP3100:\
-	:ty#winchester:ns#49:nt#4:nc#1023:\
-	:pc#204864:oc#0:
-
-Conner CFP1060:\
-	:ty#winchester:ns#111:nt#8:nc#2329:
-
-Conner CP3540:\
-	:ty#winchester:ns#49:nt#12:nc#1805:
-
-DEC DSP3107L:\
-	:ty#winchester:ns#83:nt#8:nc#3147:\
-	:pc#2089608:oc#0:
-
-DEC DSP3210 2 GB:\
-	:ty#winchester:ns#86:nt#16:nc#3040:\
-	:pc#4183040:oc#0:
-
-DEC DSP5200:\
-	:ty#winchester:ns#71:nt#21:nc#2619:\
-	:pa#32802:oa#0:ba#8192:\
-	:pb#65604:ob#32802:\
-	:pc#3904929:oc#0:\
-	:pg#3806523:og#98406:
-
-DEC DSP5350:\
-	:ty#winchester:ns#91:nt#25:nc#3053:
-
-DEC_RZ26:\
-	:ty#winchester:ns#57:nt#14:nc#2568:\
-	:pa#66234:oa#0:ba#8192:\
-	:pb#132468:ob#66234:\
-	:pc#2049264:oc#0:\
-	:pg#1850562:og#198702:
-
-DEC_RZ28:\
-	:ty#winchester:ns#84:nt#16:nc#3043:\
-	:pa#64512:oa#0:ba#8192:\
-	:pb#196224:ob#64512:\
-	:pc#4089792:oc#0:\
-	:pg#3827712:og#260736:
-
-DEC_RZ58:\
-	:ty#winchester:ns#85:nt#15:nc#2112:
-
-DEC_RZ58_whole_disk:\
-	:\
-	:pc#2692800:oc#0:
-
-DEC_RZ74:\
-	:ty#winchester:ns#91:nt#25:nc#3053:\
-	:pa#65975:oa#0:ba#8192:\
-	:pb#193375:ob#65975:\
-	:pc#4192825:oc#0:\
-	:pg#3931200:og#259350:\
-	:ph#2752750:oh#4192825:
-
-Fujitsu M2243AS:\
-	:ty#ACB4000:ns#17:nt#11:nc#752:
-
-Fujitsu M2246E:\
-	:ty#winchester:ns#35:nt#6:nc#1196:\
-	:pa#16170:oa#0:ba#8192:\
-	:pb#28140:ob#16170:\
-	:pc#251160:oc#0:\
-	:pg#206850:og#44310:
-
-Fujitsu M2263SA:\
-	:ty#winchester:ns#53:nt#15:nc#1652:
-
-Fujitsu M2266SA 1.2GB:\
-	:ty#winchester:ns#85:nt#15:nc#1652:
-
-Fujitsu M2266SA 1GB:\
-	:ty#winchester:ns#85:nt#15:nc#1642:
-
-Fujitsu M2344K:\
-	:ty#XD7053:ns#64:nt#27:nc#622:
-
-Fujitsu M2511A:\
-	:ty#winchester:ns#25:nt#1:nc#9950:
-
-Fujitsu M2512A small:\
-	:ty#winchester:ns#25:nt#1:nc#9950:\
-	:pc#248750:oc#0:
-
-Fujitsu M2512A v2:\
-	:ty#winchester:ns#25:nt#1:nc#17840:\
-	:pc#446000:oc#0:
-
-Fujitsu M2622SA:\
-	:ty#winchester:ns#64:nt#7:nc#1429:\
-	:pc#640192:oc#0:
-
-Fujitsu M2624FA:\
-	:ty#winchester:ns#64:nt#11:nc#1440:\
-	:pa#22528:oa#0:ba#8192:\
-	:pb#67584:ob#22528:\
-	:pc#1013760:oc#0:\
-	:pg#450560:og#90112:\
-	:ph#473088:oh#540672:
-
-Fujitsu M2652SA:\
-	:ty#winchester:ns#88:nt#20:nc#1935:
-
-Fujitsu M2654SA:\
-	:ty#winchester:ns#88:nt#21:nc#2174:
-
-Fujitsu M2684S:\
-	:ty#SCSI:ns#74:nt#6:nc#2338:
-
-Fujitsu-M2284/M2322:\
-	:ty#XY450:ns#32:nt#10:nc#821:
-
-Fujitsu-M2312K:\
-	:ty#XY450:ns#32:nt#7:nc#587:
-
-Fujitsu-M2333:\
-	:ty#XD7053:ns#67:nt#10:nc#821:
-
-Fujitsu-M2351 Eagle:\
-	:ty#XD7053:ns#46:nt#20:nc#840:
-
-Fujitsu-M2361 Eagle:\
-	:ty#XD7053:ns#67:nt#20:nc#840:
-
-Fujitsu-M2372K:\
-	:ty#XD7053:ns#67:nt#27:nc#743:
-
-Fujitsu-M2382:\
-	:ty#XD7053:ns#81:nt#27:nc#743:\
-	:pa#80919:oa#0:ba#8192:\
-	:pb#129033:ob#80919:\
-	:pc#1624941:oc#0:\
-	:pd#470205:od#209952:\
-	:pe#944784:oe#680157:\
-	:pf#209952:of#0:\
-	:pg#1414989:og#209952:\
-	:ph#1544022:oh#80919:
-
-Fujitsu-M2624S-512:\
-	:ty#winchester:ns#64:nt#11:nc#1429:
-
-Fujitsu-M2651SA:\
-	:ty#winchester:ns#88:nt#16:nc#1934:\
-	:pc#2723072:oc#0:
-
-Fujitsu-M2694ESA:\
-	:ty#winchester:ns#77:nt#15:nc#1830:
-
-HP 97549T:\
-	:ty#winchester:ns#64:nt#16:nc#1909:
-
-HP 97556:\
-	:ty#winchester:ns#72:nt#11:nc#1668:
-
-HP 97558:\
-	:ty#winchester:ns#72:nt#15:nc#1933:
-
-HP 97560:\
-	:ty#winchester:ns#72:nt#19:nc#1933:
-
-HP C2247 1.05GB:\
-	:ty#winchester:ns#95:nt#13:nc#1661:\
-	:pc#2051335:oc#0:\
-	:pg#1640080:og#0:\
-	:ph#411255:oh#1640080:
-
-HP C3010 / Cranel 2.0GB Fast SCSI2 H10:\
-	:ty#winchester:ns#95:nt#19:nc#2165:
-
-HP97548SU 664MB:\
-	:ty#winchester:ns#56:nt#16:nc#1445:\
-	:pa#35840:oa#0:ba#8192:\
-	:pb#71680:ob#35840:\
-	:pc#1294720:oc#0:\
-	:pg#197120:og#215040:\
-	:ph#342720:oh#609280:
-
-Hewlett Packard C2490A:\
-	:ty#winchester:ns#107:nt#18:nc#2159:
-
-Hewlett Packard C3323A:\
-	:ty#winchester:ns#98:nt#7:nc#2995:
-
-Hewlett Packard C3725S:\
-	:ty#winchester:ns#140:nt#9:nc#3362:\
-	:pc#4236120:oc#0:\
-	:ph#4193280:oh#1260:
-
-Hitachi DK315C-10:\
-	:ty#winchester:ns#75:nt#11:nc#2467:
-
-Hitachi DK315C-11:\
-	:ty#winchester:ns#58:nt#15:nc#2478:
-
-Hitachi DK315C-14:\
-	:ty#winchester:ns#75:nt#15:nc#2462:
-
-Hitachi DK326C-10:\
-	:ty#winchester:ns#87:nt#7:nc#3200:
-
-Hitachi DK326C-6:\
-	:ty#winchester:ns#87:nt#4:nc#3200:
-
-Hitachi DK515C-78:\
-	:ty#winchester:ns#69:nt#14:nc#1354:
-
-Hitachi DK516C-16:\
-	:ty#winchester:ns#80:nt#15:nc#2170:
-
-Hitachi DK517C-37:\
-	:ty#winchester:ns#81:nt#21:nc#3297:
-
-Hitachi DK815-10:\
-	:ty#XD7053:ns#67:nt#15:nc#1735:
-
-IBM 0662-S12:\
-	:ty#winchester:ns#114:nt#6:nc#3002:
-
-IBM 0662S12:\
-	:ty#winchester:ns#108:nt#5:nc#3803:
-
-IBM 0663-E15:\
-	:ty#winchester:ns#37:nt#20:nc#3182:
-
-IBM 0663L12:\
-	:ty#winchester:ns#66:nt#15:nc#1979:\
-	:pc#1959210:oc#0:
-
-IBM 0664-M1H/N1H:\
-	:ty#winchester:ns#86:nt#16:nc#2856:
-
-IBM 0664CSH:\
-	:ty#winchester:ns#125:nt#30:nc#2787:
-
-IBM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM DFHSS1x:\
-	:ty#winchester:ns#125:nt#4:nc#4383:
-
-IBM DFHSS2x:\
-	:ty#winchester:ns#125:nt#8:nc#4388:
-
-IBM DFHSS4x:\
-	:ty#winchester:ns#125:nt#16:nc#4390:
-
-IBM DPES-31080:\
-	:ty#winchester:ns#108:nt#4:nc#4901:\
-	:pc#2117232:oc#0:
-
-IBM DSAS-3270:\
-	:ty#winchester:ns#108:nt#2:nc#2542:
-
-IBM DSAS-3360:\
-	:ty#winchester:ns#108:nt#2:nc#3297:
-
-IBM DSAS-3540:\
-	:ty#winchester:ns#108:nt#3:nc#3259:
-
-IBM DSAS-3720:\
-	:ty#winchester:ns#108:nt#4:nc#3292:
-
-IBM OEM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM OEM DFHSS2F:\
-	:ty#winchester:ns#135:nt#8:nc#4076:\
-	:pa#4100760:oa#0:ba#8192:\
-	:pb#301320:ob#4100760:
-
-MAXOPTIX (NON-ISO, 1024b) DATA:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 1024b) SYSTEM:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 512b) DATA:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MAXOPTIX (NON-ISO, 512b) SYSTEM:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MICROP 4221-09MZ  10204:\
-	:ty#winchester:ns#139:nt#9:nc#3198:\
-	:pc#4000698:oc#0:
-
-MICROPOLIS 1991-27:\
-	:ty#winchester:ns#149:nt#27:nc#4400:
-
-MICROPOLIS 3243-19:\
-	:ty#winchester:ns#106:nt#19:nc#4139:
-
-MICROPOLIS 4110-09:\
-	:ty#winchester:ns#95:nt#9:nc#2283:
-
-Maxtor 7213SR NB:\
-	:ty#winchester:ns#65:nt#4:nc#1595:\
-	:pc#414700:oc#0:\
-	:pg#414700:og#0:
-
-Maxtor DXP3105S:\
-	:ty#winchester:ns#57:nt#14:nc#2568:
-
-Maxtor LXT-200S:\
-	:ty#winchester:ns#43:nt#7:nc#1117:
-
-Maxtor LXT-340SY:\
-	:ty#winchester:ns#70:nt#7:nc#1355:
-
-Maxtor LXT535ST:\
-	:ty#winchester:ns#61:nt#11:nc#1547:\
-	:pc#1038037:oc#0:
-
-Maxtor MXT1240S:\
-	:ty#winchester:ns#70:nt#15:nc#2306:\
-	:pc#2421300:oc#0:\
-	:pg#2421300:og#0:
-
-Maxtor P0-12S (1632):\
-	:ty#winchester:ns#90:nt#15:nc#1478:\
-	:pc#1995300:oc#0:\
-	:pg#1995300:og#0:
-
-Maxtor P0-12S (1795):\
-	:ty#winchester:ns#90:nt#15:nc#1510:\
-	:pc#2038500:oc#0:\
-	:pg#2038500:og#0:
-
-Maxtor P1-17S:\
-	:ty#winchester:ns#83:nt#19:nc#1816:\
-	:pa#78850:oa#0:ba#8192:\
-	:pb#78850:ob#78850:\
-	:pc#2863832:oc#0:\
-	:pd#78850:od#157700:\
-	:pg#2469582:og#236550:\
-	:ph#78850:oh#2706132:
-
-Maxtor P1-17S NB:\
-	:ty#winchester:ns#90:nt#19:nc#1711:\
-	:pc#2925810:oc#0:\
-	:pg#2925810:og#0:
-
-Maxtor XT-1050:\
-	:ty#ACB4000:ns#17:nt#5:nc#1020:
-
-Maxtor XT-3280S:\
-	:ty#winchester:ns#25:nt#15:nc#1222:
-
-Maxtor XT-4380S:\
-	:ty#winchester:ns#36:nt#15:nc#1202:
-
-Maxtor XT-8380S:\
-	:ty#winchester:ns#53:nt#8:nc#1626:
-
-Maxtor XT-8610E:\
-	:ty#winchester:ns#52:nt#12:nc#1626:
-
-Maxtor XT-8760E:\
-	:ty#winchester:ns#50:nt#15:nc#1616:\
-	:pa#97500:oa#0:ba#8192:\
-	:pb#63750:ob#658500:\
-	:pc#1212000:oc#0:\
-	:pd#280500:od#97500:\
-	:pe#280500:oe#378000:\
-	:pf#489750:of#722250:\
-	:pg#561000:og#97500:\
-	:ph#658500:oh#0:
-
-Maxtor XT-8760S:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-Micropolis 1304:\
-	:ty#ACB4000:ns#17:nt#6:nc#825:
-
-Micropolis 1325:\
-	:ty#ACB4000:ns#17:nt#8:nc#1022:
-
-Micropolis 1355:\
-	:ty#winchester:ns#34:nt#8:nc#1018:
-
-Micropolis 1528-15:\
-	:ty#winchester:ns#83:nt#15:nc#2102:\
-	:pa#32370:oa#0:ba#8192:\
-	:pb#64740:ob#32370:\
-	:pc#2616990:oc#0:\
-	:pg#2519880:og#97110:
-
-Micropolis 1548-15:\
-	:ty#winchester:ns#131:nt#15:nc#1701:\
-	:pa#33405:oa#0:ba#8192:\
-	:pb#66810:ob#33405:\
-	:pc#3342465:oc#0:\
-	:pg#3242250:og#100215:
-
-Micropolis 1558:\
-	:ty#winchester:ns#35:nt#15:nc#1218:
-
-Micropolis 1578-15:\
-	:ty#winchester:ns#35:nt#15:nc#1231:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#646275:oc#0:\
-	:pg#548625:og#97650:
-
-Micropolis 1588-15:\
-	:ty#winchester:ns#53:nt#15:nc#1637:\
-	:pa#32595:oa#0:ba#8192:\
-	:pb#65190:ob#32595:\
-	:pc#1301415:oc#0:\
-	:pg#1203630:og#97785:
-
-Micropolis 1598-15:\
-	:ty#winchester:ns#70:nt#15:nc#1931:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#2027550:oc#0:\
-	:pg#1929900:og#97650:
-
-Micropolis 1624-7:\
-	:ty#winchester:ns#114:nt#7:nc#1647:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#1314306:oc#0:\
-	:pg#1216152:og#98154:
-
-Micropolis 1674-7:\
-	:ty#winchester:ns#35:nt#7:nc#1255:\
-	:pa#16415:oa#0:ba#8192:\
-	:pb#32830:ob#16415:\
-	:pc#307475:oc#0:\
-	:pg#258230:og#49245:
-
-Micropolis 1684-7:\
-	:ty#winchester:ns#53:nt#7:nc#1785:\
-	:pa#32648:oa#0:ba#8192:\
-	:pb#65296:ob#32648:\
-	:pc#662235:oc#0:\
-	:pg#564291:og#97944:
-
-Micropolis 1908-15:\
-	:ty#winchester:ns#95:nt#15:nc#1890:\
-	:pa#32775:oa#0:ba#8192:\
-	:pb#65550:ob#32775:\
-	:pc#2693250:oc#0:\
-	:pg#2594925:og#98325:
-
-Micropolis 1924-21:\
-	:ty#winchester:ns#94:nt#21:nc#2072:\
-	:pa#33558:oa#0:ba#8192:\
-	:pb#67116:ob#33558:\
-	:pc#4090128:oc#0:\
-	:pg#3989454:og#100674:
-
-Micropolis 1926-15:\
-	:ty#winchester:ns#101:nt#15:nc#2769:\
-	:pa#33330:oa#0:ba#8192:\
-	:pb#66660:ob#33330:\
-	:pc#4195035:oc#0:\
-	:pg#4095045:og#99990:
-
-Micropolis 1936-21:\
-	:ty#winchester:ns#101:nt#21:nc#2772:\
-	:pa#33936:oa#0:ba#8192:\
-	:pb#67872:ob#33936:\
-	:pc#5879412:oc#0:\
-	:pg#2846382:og#101808:\
-	:ph#2931222:oh#2948190:
-
-Micropolis 2105-8:\
-	:ty#winchester:ns#94:nt#8:nc#1448:\
-	:pa#32336:oa#0:ba#8192:\
-	:pb#64672:ob#32336:\
-	:pc#1088896:oc#0:\
-	:pg#991888:og#97008:
-
-Micropolis 2108-10:\
-	:ty#winchester:ns#94:nt#10:nc#1450:\
-	:pa#31960:oa#0:ba#8192:\
-	:pb#63920:ob#31960:\
-	:pc#1363000:oc#0:\
-	:pg#1267120:og#95880:
-
-Micropolis 2112-15:\
-	:ty#winchester:ns#94:nt#15:nc#1452:\
-	:pa#33840:oa#0:ba#8192:\
-	:pb#67680:ob#33840:\
-	:pc#2047320:oc#0:\
-	:pg#1945800:og#101520:
-
-Micropolis 2205-05:\
-	:ty#winchester:ns#109:nt#5:nc#2088:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#1137960:oc#0:\
-	:pg#1039860:og#98100:
-
-Micropolis 2210-09:\
-	:ty#winchester:ns#109:nt#9:nc#2099:\
-	:pa#33354:oa#0:ba#8192:\
-	:pb#66708:ob#33354:\
-	:pc#2059119:oc#0:\
-	:pg#1959057:og#100062:
-
-Micropolis 2217-15:\
-	:ty#winchester:ns#109:nt#15:nc#2105:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#3441675:oc#0:\
-	:pg#3343575:og#98100:
-
-Micropolis 4110:\
-	:ty#winchester:ns#114:nt#9:nc#1998:
-
-Micropolis 4221:\
-	:ty#winchester:ns#109:nt#9:nc#4079:\
-	:pa#4001499:oa#0:ba#8192:\
-	:pc#4001499:oc#0:
-
-NEC D2363:\
-	:ty#XD7053:ns#67:nt#27:nc#964:
-
-NEC-D2352:\
-	:ty#XD7053:ns#57:nt#19:nc#758:
-
-QUANTUM EMPIRE_2100S:\
-	:ty#winchester:ns#137:nt#12:nc#2497:\
-	:pc#4105068:oc#0:
-
-QUANTUM LPS540S:\
-	:ty#winchester:ns#125:nt#4:nc#2113:
-
-QUANTUM PD1050iS:\
-	:ty#winchester:ns#92:nt#12:nc#1859:\
-	:pc#2052336:oc#0:
-
-QUANTUM XP34301:\
-	:ty#winchester:ns#118:nt#20:nc#3561:
-
-Quantum ELS 127S:\
-	:ty#winchester:ns#54:nt#3:nc#1541:
-
-Quantum ELS 170S:\
-	:ty#winchester:ns#54:nt#4:nc#1542:
-
-Quantum ELS 85S:\
-	:ty#winchester:ns#54:nt#2:nc#1535:
-
-Quantum Empire 1080S:\
-	:ty#winchester:ns#92:nt#16:nc#1431:
-
-Quantum Empire 540S:\
-	:ty#winchester:ns#92:nt#8:nc#1431:
-
-Quantum GoDrive 120S:\
-	:ty#winchester:ns#56:nt#4:nc#1067:
-
-Quantum GoDrive 160S:\
-	:ty#winchester:ns#58:nt#4:nc#1413:
-
-Quantum LPS 105S:\
-	:ty#winchester:ns#42:nt#4:nc#1221:
-
-Quantum LPS 120S:\
-	:ty#winchester:ns#60:nt#2:nc#1987:
-
-Quantum LPS 240S:\
-	:ty#winchester:ns#60:nt#4:nc#1995:
-
-Quantum LPS 270S:\
-	:ty#winchester:ns#76:nt#7:nc#992:
-
-Quantum LPS 525S:\
-	:ty#winchester:ns#70:nt#6:nc#2444:
-
-Quantum Lightning 730S:\
-	:ty#winchester:ns#63:nt#16:nc#1415:\
-	:pa#161280:oa#0:ba#8192:\
-	:pb#96768:ob#161280:\
-	:pc#1426320:oc#0:\
-	:pg#1168272:og#258048:
-
-Quantum PD 1050S:\
-	:ty#winchester:ns#70:nt#12:nc#2444:
-
-Quantum PD 120S:\
-	:ty#winchester:ns#42:nt#5:nc#1114:
-
-Quantum PD 1225S:\
-	:ty#winchester:ns#70:nt#14:nc#2442:
-
-Quantum PD 170S:\
-	:ty#winchester:ns#42:nt#7:nc#1117:
-
-Quantum PD 210S:\
-	:ty#winchester:ns#49:nt#7:nc#1189:
-
-Quantum PD 425S:\
-	:ty#winchester:ns#60:nt#9:nc#1540:
-
-Quantum PD 700S:\
-	:ty#winchester:ns#70:nt#8:nc#2441:
-
-Quantum ProDrive 80S:\
-	:ty#winchester:ns#34:nt#6:nc#832:
-
-Quantum XP32150:\
-	:ty#winchester:ns#109:nt#10:nc#3850:
-
-RICOH RO-5031E:\
-	:ty#winchester:ns#54:nt#15:nc#710:\
-	:pc#575100:oc#0:
-
-RZ24:\
-	:ty#winchester:ns#38:nt#8:nc#1344:\
-	:pc#409792:oc#0:
-
-RZ55:\
-	:ty#winchester:ns#35:nt#15:nc#1218:\
-	:pa#32025:oa#0:ba#8192:\
-	:pb#59850:ob#32025:\
-	:pc#639450:oc#0:\
-	:pg#547575:og#91875:
-
-SEAGATE ST11950N:\
-	:ty#winchester:ns#81:nt#15:nc#2715:\
-	:pc#3298725:oc#0:
-
-SEAGATE ST15230N:\
-	:ty#winchester:ns#111:nt#19:nc#3974:
-
-SEAGATE ST31200N:\
-	:ty#winchester:ns#85:nt#9:nc#2692:
-
-SEAGATE ST31230N:\
-	:ty#winchester:ns#104:nt#5:nc#3978:\
-	:pc#2068560:oc#0:
-
-SEAGATE ST32550N:\
-	:ty#winchester:ns#109:nt#11:nc#3495:\
-	:pc#4190505:oc#0:
-
-SEAGATE ST3600N:\
-	:ty#winchester:ns#79:nt#7:nc#1853:\
-	:pc#1024709:oc#0:
-
-ST83220K:\
-	:ty#"ISP-80":ns#102:nt#19:nc#2652:
-
-SUN0104:\
-	:ty#winchester:ns#35:nt#6:nc#974:
-
-SUN0121:\
-	:ty#winchester:ns#39:nt#4:nc#1520:
-
-SUN0207:\
-	:ty#winchester:ns#36:nt#9:nc#1254:
-
-SUN0327:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-SUN0424:\
-	:ty#winchester:ns#80:nt#9:nc#1151:
-
-SUN0535:\
-	:ty#winchester:ns#80:nt#7:nc#1866:
-
-SUN0669:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-SUN1.3G:\
-	:ty#winchester:ns#80:nt#17:nc#1965:
-
-SUN2.1G:\
-	:ty#winchester:ns#80:nt#19:nc#2733:
-
-Sabre ST82500J:\
-	:ty#XD7053:ns#82:nt#19:nc#2609:
-
-Seagate (CDC) Wren V 94181-702:\
-	:ty#winchester:ns#48:nt#15:nc#1543:
-
-Seagate (CDC) Wren VI 94191-766:\
-	:ty#winchester:ns#52:nt#15:nc#1659:
-
-Seagate (CDC) Wren VII 94601-1.2G SunOS 4.1.1:\
-	:ty#winchester:ns#70:nt#15:nc#1925:
-
-Seagate (CDC) Wren VII 94601-15:\
-	:ty#winchester:ns#71:nt#15:nc#1905:
-
-Seagate (CDC) Wren VIII ST41650N:\
-	:ty#winchester:ns#89:nt#15:nc#2070:
-
-Seagate Elite ST43400N-3.5G:\
-	:ty#winchester:ns#99:nt#21:nc#2736:\
-	:pa#2843360:oa#0:ba#8192:\
-	:pb#2843360:ob#2841993:
-
-Seagate IPI ZBR Elite:\
-	:ty#"ISP-80":ns#78:nt#17:nc#1893:\
-	:pa#34476:oa#0:ba#8192:\
-	:pb#132600:ob#34476:\
-	:pc#2510118:oc#0:\
-	:pg#663000:og#167076:\
-	:ph#1680042:oh#830076:
-
-Seagate ST11200N:\
-	:ty#winchester:ns#80:nt#15:nc#1714:\
-	:pa#2056800:oa#0:ba#8192:\
-	:pc#2056800:oc#0:
-
-Seagate ST11900N:\
-	:ty#winchester:ns#83:nt#15:nc#2619:\
-	:pb#498000:ob#0:\
-	:pc#3260655:oc#0:\
-	:ph#2761410:oh#498000:
-
-Seagate ST1239N SWIFT:\
-	:ty#winchester:ns#35:nt#9:nc#1264:
-
-Seagate ST12400N 2.4GB:\
-	:ty#winchester:ns#82:nt#19:nc#2668:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#4156744:oc#0:\
-	:pg#4058590:og#98154:
-
-Seagate ST12550N:\
-	:ty#winchester:ns#80:nt#19:nc#2747:
-
-Seagate ST1480N:\
-	:ty#winchester:ns#64:nt#9:nc#1456:
-
-Seagate ST15150N:\
-	:ty#winchester:ns#78:nt#21:nc#5119:\
-	:pc#8384922:oc#0:
-
-Seagate ST410800N Elite 9:\
-	:ty#winchester:ns#108:nt#27:nc#6087:\
-	:pc#17749692:oc#0:
-
-Seagate ST42100N - Wren 9:\
-	:ty#winchester:ns#96:nt#15:nc#2574:\
-	:pc#3706560:oc#0:
-
-Seagate ST42400N Elite 2:\
-	:ty#winchester:ns#84:nt#19:nc#2604:\
-	:pc#4155984:oc#0:
-
-Seagate Sabre-5 ST81236J:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:\
-	:pa#99630:oa#0:ba#8192:\
-	:pb#261990:ob#99630:\
-	:pc#2008590:oc#0:\
-	:pd#548580:od#361620:\
-	:pe#1098390:oe#910200:\
-	:pf#361620:of#0:\
-	:pg#1646970:og#361620:\
-	:ph#1908960:oh#99630:
-
-SeagateST3283N:\
-	:ty#winchester:ns#57:nt#5:nc#1689:
-
-Sun1.0G:\
-	:ty#winchester:ns#80:nt#15:nc#1703:
-
-SyQuest SQ555:\
-	:ty#winchester:ns#34:nt#2:nc#1273:\
-	:pc#86564:oc#0:
-
-Toshiba MK 156F:\
-	:ty#winchester:ns#34:nt#10:nc#815:
-
-Vertex V185:\
-	:ty#ACB4000:ns#17:nt#7:nc#1163:
-
diff --git a/etc/etc.sgi/disktab b/etc/etc.sgi/disktab
index d9467b77726..49bab082140 100644
--- a/etc/etc.sgi/disktab
+++ b/etc/etc.sgi/disktab
@@ -1,32 +1,4 @@
-# Disk geometry and partition layout tables.
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removeable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, ns*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-p]	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#	t[a-p]	partition types (filesystem, swap, etc)
-#
-# All partition sizes reserve space for bad sector tables.
-# (5 cylinders needed for maintenance + replacement sectors)
-#
+# $OpenBSD: disktab,v 1.11 2010/07/02 20:33:54 tedu Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated:se#512:nc#20:nt#4:ns#128:\
@@ -43,74 +15,3 @@ cdroot|cdramdiskroot|RAM-disk root FS image:\
 	:ta=4.2BSD:oa#80:pa#143280:fa#2048:ba#16384:\
 	:ob#0:pb#0:oc#0:pc#143360:op#0:pp#80:
 
-# Seagate ST31200N
-ST31200N-MBR:\
-	:ty=winchester:ns#84:nt#9:nc#2700:\
-	:pa#65536:oa#4096:ba#8192:fa#1024:ta=4.2bsd:\
-	:pb#131072:ob#69632:bb#8192:fb#1024:tb=swap:\
-	:pc#2037104:oc#4096:bc#8192:fc#1024:\
-	:pd#2041200:od#0:bd#8192:fd#1024:\
-	:pe#4064:oe#32:be#8192:fe#1024:te=msdos:\
-	:pg#619200:og#200704:bg#8192:fg#1024:tg=4.2bsd:\
-	:ph#1221296:oh#819904:bh#8192:fh#1024:th=4.2bsd:
-
-# QUANTUM, Trailblazer 850 with MBR boot.
-TRB850S-MBR:\
-	:ty=winchester:ns#113:nt#4:nc#3653:\
-	:pa#88096:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-	:pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-	:pc#1647060:oc#0:bc#8192:fc#1024:\
-	:pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-	:pe#586000:oe#229408:be#8192:fe#1024:te=4.2bsd:\
-	:pf#415826:of#815408:bf#8192:ff#1024:tf=4.2bsd:\
-	:pg#415826:og#1231234:bg#8192:fg#1024:tg=4.2bsd:\
-	:ph#831652:oh#815408:bh#8192:fh#1024:th=4.2bsd:
-
-#QUANTUM, FIREBALL1080S
-FIREBALL1080S-MBR:\
-	:ty=winchester:ns#139:nt#4:nc#3835:\
-	:pa#120832:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-	:pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-	:pc#2132260:oc#0:bc#8192:fc#1024:\
-	:pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-	:pe#781250:oe#262144:be#8192:fe#1024:te=4.2bsd:\
-	:pf#544433:of#1043394:bf#8192:ff#1024:tf=4.2bsd:\
-	:pg#544433:og#1587827:bg#8192:fg#1024:tg=4.2bsd:\
-	:ph#1088866:oh#1043394:bh#8192:fh#1024:th=4.2bsd:
-
-#QUANTUM, FIREBALL_TM3200S
-FIREBALL_TM3200S-MBR:\
-	:ty=winchester:ns#184:nt#5:nc#6810:\
-	:pa#120832:oa#10240:ba#8192:fa#1024:ta=4.2bsd:\
-	:pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-	:pc#6265200:oc#0:bc#8192:fc#1024:\
-	:pd#10208:od#32:bd#8192:fd#1024:td=msdos:\
-	:pe#781250:oe#262144:be#8192:fe#1024:te=4.2bsd:\
-	:pf#1205000:of#1043394:bf#8192:ff#1024:tf=4.2bsd:\
-	:pg#2008403:og#2248394:bg#8192:fg#1024:tg=4.2bsd:\
-	:ph#2008403:oh#4256797:bh#8192:fh#1024:th=4.2bsd:
-
-# QUANTUM ATLAS, XP34300
-XP34300:\
-	:ty=winchester:ns#107:nt#20:nc#3907:\
-	:pa#131072:oa#0:ba#8192:fa#1024:ta=4.2bsd:\
-	:pb#131072:ob#131072:bb#8192:fb#1024:tb=swap:\
-	:pc#8360980:oc#0:bc#8192:fc#1024:\
-	:pd#1024000:od#262144:bd#8192:fd#1024:td=4.2bsd:\
-	:pe#1024000:oe#1286144:be#8192:fe#1024:te=4.2bsd:\
-	:pf#2048000:of#2310144:bf#8192:ff#1024:tf=4.2bsd:\
-	:pg#2048000:og#4358144:bg#8192:fg#1024:tg=4.2bsd:\
-	:ph#1954836:oh#6406144:bh#8192:fh#1024:th=4.2bsd:\
-	:pi#2712458:oi#262144:bi#8192:fi#1024:ti=4.2bsd:\
-	:pj#2712458:oj#2974602:bj#8192:fj#1024:tj=4.2bsd:\
-	:pk#2673920:ok#5687060:bk#8192:fk#1024:tk=4.2bsd:\
-	:pl#4068688:ol#262144:bl#8192:fl#1024:tl=4.2bsd:\
-	:pm#4030148:om#4330832:bm#8192:fm#1024:tm=4.2bsd:\
-	:pn#8098836:on#262144:bn#8192:fn#1024:tn=4.2bsd:
-
-#iomega ZIP with MBR boot partition
-ZIP-MBR:\
-	:ty=zip:ns#32:nt#64:nc#96:\
-	:pa#188416:oa#4096:ba#8192:fa#1024:ta=4.2bsd:\
-	:pc#192512:oc#4096:bc#8192:fc#1024:\
-	:pd#4064:od#32:bd#8192:fd#1024:td=msdos:\
diff --git a/etc/etc.socppc/disktab b/etc/etc.socppc/disktab
index b7cc0c05eb2..e4e20b90aac 100644
--- a/etc/etc.socppc/disktab
+++ b/etc/etc.socppc/disktab
@@ -1,21 +1,4 @@
-# $OpenBSD: disktab,v 1.3 2010/02/15 22:56:21 kettenis Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
+# $OpenBSD: disktab,v 1.4 2010/07/02 20:33:54 tedu Exp $
 
 rdroot|ramdiskroot|RAM-disk root FS image:\
 	:ty=simulated:se#512:nc#16:nt#2:ns#256:\
diff --git a/etc/etc.sparc/disktab b/etc/etc.sparc/disktab
index 2ee5063f2d4..432e06a698b 100644
--- a/etc/etc.sparc/disktab
+++ b/etc/etc.sparc/disktab
@@ -1,21 +1,4 @@
-# $OpenBSD: disktab,v 1.22 2008/03/06 08:23:48 deraadt Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
+# $OpenBSD: disktab,v 1.23 2010/07/02 20:33:54 tedu Exp $
 
 miniroot:\
 	:ty=winchester:se#512:nt#2:rm#300:ns#64:nc#96:\
@@ -43,837 +26,3 @@ fakecdrom|Fake image for Bootable CDROM:\
 	:pc#1310720:oc#0:bc#8192:fc#1024:tc=4.2BSD:\
 	:pd#1310720:od#0:bd#8192:fd#1024:td=4.2BSD:
 
-ASI-1.0GIBM:\
-	:ty#winchester:ns#80:nt#15:nc#1632:
-
-Arte DEC DSP3160S:\
-	:ty#winchester:ns#112:nt#16:nc#1744:
-
-CDC 9720-850:\
-	:ty#XD7053:ns#66:nt#15:nc#1358:
-
-CDC EMD 9720:\
-	:ty#XD7053:ns#48:nt#10:nc#1147:
-
-CDC EMD 9720-1230:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:
-
-CDC IPI 9720:\
-	:ty#ISP-80:ns#82:nt#15:nc#1631:\
-	:pa#33210:oa#0:ba#8192:\
-	:pb#131610:ob#33210:\
-	:pc#2006130:oc#0:\
-	:pg#196800:og#164820:\
-	:ph#1644510:oh#361620:
-
-CDC IPI 9722:\
-	:ty#ISP-80:ns#156:nt#7:nc#1630:\
-	:pa#33852:oa#0:ba#8192:\
-	:pb#132132:ob#33852:\
-	:pc#1779960:oc#0:\
-	:pg#197652:og#165984:\
-	:ph#1416324:oh#363636:
-
-CDC Wren IV 94171-344:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-CONNER 30170E:\
-	:ty#winchester:ns#46:nt#8:nc#897:\
-	:pa#14720:oa#0:ba#8192:\
-	:pb#40480:ob#14720:\
-	:pc#330096:oc#0:\
-	:pg#274896:og#55200:
-
-CONNER 30200:\
-	:ty#winchester:ns#49:nt#4:nc#2121:\
-	:pc#415716:oc#0:
-
-CONNER CFP4207S  4.28GB:\
-	:ty#winchester:ns#125:nt#20:nc#3353:\
-	:pc#8382500:oc#0:
-
-CONNER CP3500-540MB-3.5:\
-	:ty#winchester:ns#50:nt#12:nc#1768:\
-	:pc#1060800:oc#0:
-
-CP3100:\
-	:ty#winchester:ns#49:nt#4:nc#1023:\
-	:pc#204864:oc#0:
-
-Conner CFP1060:\
-	:ty#winchester:ns#111:nt#8:nc#2329:
-
-Conner CP3540:\
-	:ty#winchester:ns#49:nt#12:nc#1805:
-
-DEC DSP3107L:\
-	:ty#winchester:ns#83:nt#8:nc#3147:\
-	:pc#2089608:oc#0:
-
-DEC DSP3210 2 GB:\
-	:ty#winchester:ns#86:nt#16:nc#3040:\
-	:pc#4183040:oc#0:
-
-DEC DSP5200:\
-	:ty#winchester:ns#71:nt#21:nc#2619:\
-	:pa#32802:oa#0:ba#8192:\
-	:pb#65604:ob#32802:\
-	:pc#3904929:oc#0:\
-	:pg#3806523:og#98406:
-
-DEC DSP5350:\
-	:ty#winchester:ns#91:nt#25:nc#3053:
-
-DEC_RZ26:\
-	:ty#winchester:ns#57:nt#14:nc#2568:\
-	:pa#66234:oa#0:ba#8192:\
-	:pb#132468:ob#66234:\
-	:pc#2049264:oc#0:\
-	:pg#1850562:og#198702:
-
-DEC_RZ28:\
-	:ty#winchester:ns#84:nt#16:nc#3043:\
-	:pa#64512:oa#0:ba#8192:\
-	:pb#196224:ob#64512:\
-	:pc#4089792:oc#0:\
-	:pg#3827712:og#260736:
-
-DEC_RZ58:\
-	:ty#winchester:ns#85:nt#15:nc#2112:
-
-DEC_RZ58_whole_disk:\
-	:\
-	:pc#2692800:oc#0:
-
-DEC_RZ74:\
-	:ty#winchester:ns#91:nt#25:nc#3053:\
-	:pa#65975:oa#0:ba#8192:\
-	:pb#193375:ob#65975:\
-	:pc#4192825:oc#0:\
-	:pg#3931200:og#259350:\
-	:ph#2752750:oh#4192825:
-
-Fujitsu M2243AS:\
-	:ty#ACB4000:ns#17:nt#11:nc#752:
-
-Fujitsu M2246E:\
-	:ty#winchester:ns#35:nt#6:nc#1196:\
-	:pa#16170:oa#0:ba#8192:\
-	:pb#28140:ob#16170:\
-	:pc#251160:oc#0:\
-	:pg#206850:og#44310:
-
-Fujitsu M2263SA:\
-	:ty#winchester:ns#53:nt#15:nc#1652:
-
-Fujitsu M2266SA 1.2GB:\
-	:ty#winchester:ns#85:nt#15:nc#1652:
-
-Fujitsu M2266SA 1GB:\
-	:ty#winchester:ns#85:nt#15:nc#1642:
-
-Fujitsu M2344K:\
-	:ty#XD7053:ns#64:nt#27:nc#622:
-
-Fujitsu M2511A:\
-	:ty#winchester:ns#25:nt#1:nc#9950:
-
-Fujitsu M2512A small:\
-	:ty#winchester:ns#25:nt#1:nc#9950:\
-	:pc#248750:oc#0:
-
-Fujitsu M2512A v2:\
-	:ty#winchester:ns#25:nt#1:nc#17840:\
-	:pc#446000:oc#0:
-
-Fujitsu M2622SA:\
-	:ty#winchester:ns#64:nt#7:nc#1429:\
-	:pc#640192:oc#0:
-
-Fujitsu M2624FA:\
-	:ty#winchester:ns#64:nt#11:nc#1440:\
-	:pa#22528:oa#0:ba#8192:\
-	:pb#67584:ob#22528:\
-	:pc#1013760:oc#0:\
-	:pg#450560:og#90112:\
-	:ph#473088:oh#540672:
-
-Fujitsu M2652SA:\
-	:ty#winchester:ns#88:nt#20:nc#1935:
-
-Fujitsu M2654SA:\
-	:ty#winchester:ns#88:nt#21:nc#2174:
-
-Fujitsu M2684S:\
-	:ty#SCSI:ns#74:nt#6:nc#2338:
-
-Fujitsu-M2284/M2322:\
-	:ty#XY450:ns#32:nt#10:nc#821:
-
-Fujitsu-M2312K:\
-	:ty#XY450:ns#32:nt#7:nc#587:
-
-Fujitsu-M2333:\
-	:ty#XD7053:ns#67:nt#10:nc#821:
-
-Fujitsu-M2351 Eagle:\
-	:ty#XD7053:ns#46:nt#20:nc#840:
-
-Fujitsu-M2361 Eagle:\
-	:ty#XD7053:ns#67:nt#20:nc#840:
-
-Fujitsu-M2372K:\
-	:ty#XD7053:ns#67:nt#27:nc#743:
-
-Fujitsu-M2382:\
-	:ty#XD7053:ns#81:nt#27:nc#743:\
-	:pa#80919:oa#0:ba#8192:\
-	:pb#129033:ob#80919:\
-	:pc#1624941:oc#0:\
-	:pd#470205:od#209952:\
-	:pe#944784:oe#680157:\
-	:pf#209952:of#0:\
-	:pg#1414989:og#209952:\
-	:ph#1544022:oh#80919:
-
-Fujitsu-M2624S-512:\
-	:ty#winchester:ns#64:nt#11:nc#1429:
-
-Fujitsu-M2651SA:\
-	:ty#winchester:ns#88:nt#16:nc#1934:\
-	:pc#2723072:oc#0:
-
-Fujitsu-M2694ESA:\
-	:ty#winchester:ns#77:nt#15:nc#1830:
-
-HP 97549T:\
-	:ty#winchester:ns#64:nt#16:nc#1909:
-
-HP 97556:\
-	:ty#winchester:ns#72:nt#11:nc#1668:
-
-HP 97558:\
-	:ty#winchester:ns#72:nt#15:nc#1933:
-
-HP 97560:\
-	:ty#winchester:ns#72:nt#19:nc#1933:
-
-HP C2247 1.05GB:\
-	:ty#winchester:ns#95:nt#13:nc#1661:\
-	:pc#2051335:oc#0:\
-	:pg#1640080:og#0:\
-	:ph#411255:oh#1640080:
-
-HP C3010 / Cranel 2.0GB Fast SCSI2 H10:\
-	:ty#winchester:ns#95:nt#19:nc#2165:
-
-HP97548SU 664MB:\
-	:ty#winchester:ns#56:nt#16:nc#1445:\
-	:pa#35840:oa#0:ba#8192:\
-	:pb#71680:ob#35840:\
-	:pc#1294720:oc#0:\
-	:pg#197120:og#215040:\
-	:ph#342720:oh#609280:
-
-Hewlett Packard C2490A:\
-	:ty#winchester:ns#107:nt#18:nc#2159:
-
-Hewlett Packard C3323A:\
-	:ty#winchester:ns#98:nt#7:nc#2995:
-
-Hewlett Packard C3725S:\
-	:ty#winchester:ns#140:nt#9:nc#3362:\
-	:pc#4236120:oc#0:\
-	:ph#4193280:oh#1260:
-
-Hitachi DK315C-10:\
-	:ty#winchester:ns#75:nt#11:nc#2467:
-
-Hitachi DK315C-11:\
-	:ty#winchester:ns#58:nt#15:nc#2478:
-
-Hitachi DK315C-14:\
-	:ty#winchester:ns#75:nt#15:nc#2462:
-
-Hitachi DK326C-10:\
-	:ty#winchester:ns#87:nt#7:nc#3200:
-
-Hitachi DK326C-6:\
-	:ty#winchester:ns#87:nt#4:nc#3200:
-
-Hitachi DK515C-78:\
-	:ty#winchester:ns#69:nt#14:nc#1354:
-
-Hitachi DK516C-16:\
-	:ty#winchester:ns#80:nt#15:nc#2170:
-
-Hitachi DK517C-37:\
-	:ty#winchester:ns#81:nt#21:nc#3297:
-
-Hitachi DK815-10:\
-	:ty#XD7053:ns#67:nt#15:nc#1735:
-
-IBM 0662-S12:\
-	:ty#winchester:ns#114:nt#6:nc#3002:
-
-IBM 0662S12:\
-	:ty#winchester:ns#108:nt#5:nc#3803:
-
-IBM 0663-E15:\
-	:ty#winchester:ns#37:nt#20:nc#3182:
-
-IBM 0663L12:\
-	:ty#winchester:ns#66:nt#15:nc#1979:\
-	:pc#1959210:oc#0:
-
-IBM 0664-M1H/N1H:\
-	:ty#winchester:ns#86:nt#16:nc#2856:
-
-IBM 0664CSH:\
-	:ty#winchester:ns#125:nt#30:nc#2787:
-
-IBM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM DFHSS1x:\
-	:ty#winchester:ns#125:nt#4:nc#4383:
-
-IBM DFHSS2x:\
-	:ty#winchester:ns#125:nt#8:nc#4388:
-
-IBM DFHSS4x:\
-	:ty#winchester:ns#125:nt#16:nc#4390:
-
-IBM DPES-31080:\
-	:ty#winchester:ns#108:nt#4:nc#4901:\
-	:pc#2117232:oc#0:
-
-IBM DSAS-3270:\
-	:ty#winchester:ns#108:nt#2:nc#2542:
-
-IBM DSAS-3360:\
-	:ty#winchester:ns#108:nt#2:nc#3297:
-
-IBM DSAS-3540:\
-	:ty#winchester:ns#108:nt#3:nc#3259:
-
-IBM DSAS-3720:\
-	:ty#winchester:ns#108:nt#4:nc#3292:
-
-IBM OEM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM OEM DFHSS2F:\
-	:ty#winchester:ns#135:nt#8:nc#4076:\
-	:pa#4100760:oa#0:ba#8192:\
-	:pb#301320:ob#4100760:
-
-MAXOPTIX (NON-ISO, 1024b) DATA:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 1024b) SYSTEM:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 512b) DATA:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MAXOPTIX (NON-ISO, 512b) SYSTEM:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MICROP 4221-09MZ  10204:\
-	:ty#winchester:ns#139:nt#9:nc#3198:\
-	:pc#4000698:oc#0:
-
-MICROPOLIS 1991-27:\
-	:ty#winchester:ns#149:nt#27:nc#4400:
-
-MICROPOLIS 3243-19:\
-	:ty#winchester:ns#106:nt#19:nc#4139:
-
-MICROPOLIS 4110-09:\
-	:ty#winchester:ns#95:nt#9:nc#2283:
-
-Maxtor 7213SR NB:\
-	:ty#winchester:ns#65:nt#4:nc#1595:\
-	:pc#414700:oc#0:\
-	:pg#414700:og#0:
-
-Maxtor DXP3105S:\
-	:ty#winchester:ns#57:nt#14:nc#2568:
-
-Maxtor LXT-200S:\
-	:ty#winchester:ns#43:nt#7:nc#1117:
-
-Maxtor LXT-340SY:\
-	:ty#winchester:ns#70:nt#7:nc#1355:
-
-Maxtor LXT535ST:\
-	:ty#winchester:ns#61:nt#11:nc#1547:\
-	:pc#1038037:oc#0:
-
-Maxtor MXT1240S:\
-	:ty#winchester:ns#70:nt#15:nc#2306:\
-	:pc#2421300:oc#0:\
-	:pg#2421300:og#0:
-
-Maxtor P0-12S (1632):\
-	:ty#winchester:ns#90:nt#15:nc#1478:\
-	:pc#1995300:oc#0:\
-	:pg#1995300:og#0:
-
-Maxtor P0-12S (1795):\
-	:ty#winchester:ns#90:nt#15:nc#1510:\
-	:pc#2038500:oc#0:\
-	:pg#2038500:og#0:
-
-Maxtor P1-17S:\
-	:ty#winchester:ns#83:nt#19:nc#1816:\
-	:pa#78850:oa#0:ba#8192:\
-	:pb#78850:ob#78850:\
-	:pc#2863832:oc#0:\
-	:pd#78850:od#157700:\
-	:pg#2469582:og#236550:\
-	:ph#78850:oh#2706132:
-
-Maxtor P1-17S NB:\
-	:ty#winchester:ns#90:nt#19:nc#1711:\
-	:pc#2925810:oc#0:\
-	:pg#2925810:og#0:
-
-Maxtor XT-1050:\
-	:ty#ACB4000:ns#17:nt#5:nc#1020:
-
-Maxtor XT-3280S:\
-	:ty#winchester:ns#25:nt#15:nc#1222:
-
-Maxtor XT-4380S:\
-	:ty#winchester:ns#36:nt#15:nc#1202:
-
-Maxtor XT-8380S:\
-	:ty#winchester:ns#53:nt#8:nc#1626:
-
-Maxtor XT-8610E:\
-	:ty#winchester:ns#52:nt#12:nc#1626:
-
-Maxtor XT-8760E:\
-	:ty#winchester:ns#50:nt#15:nc#1616:\
-	:pa#97500:oa#0:ba#8192:\
-	:pb#63750:ob#658500:\
-	:pc#1212000:oc#0:\
-	:pd#280500:od#97500:\
-	:pe#280500:oe#378000:\
-	:pf#489750:of#722250:\
-	:pg#561000:og#97500:\
-	:ph#658500:oh#0:
-
-Maxtor XT-8760S:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-Micropolis 1304:\
-	:ty#ACB4000:ns#17:nt#6:nc#825:
-
-Micropolis 1325:\
-	:ty#ACB4000:ns#17:nt#8:nc#1022:
-
-Micropolis 1355:\
-	:ty#winchester:ns#34:nt#8:nc#1018:
-
-Micropolis 1528-15:\
-	:ty#winchester:ns#83:nt#15:nc#2102:\
-	:pa#32370:oa#0:ba#8192:\
-	:pb#64740:ob#32370:\
-	:pc#2616990:oc#0:\
-	:pg#2519880:og#97110:
-
-Micropolis 1548-15:\
-	:ty#winchester:ns#131:nt#15:nc#1701:\
-	:pa#33405:oa#0:ba#8192:\
-	:pb#66810:ob#33405:\
-	:pc#3342465:oc#0:\
-	:pg#3242250:og#100215:
-
-Micropolis 1558:\
-	:ty#winchester:ns#35:nt#15:nc#1218:
-
-Micropolis 1578-15:\
-	:ty#winchester:ns#35:nt#15:nc#1231:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#646275:oc#0:\
-	:pg#548625:og#97650:
-
-Micropolis 1588-15:\
-	:ty#winchester:ns#53:nt#15:nc#1637:\
-	:pa#32595:oa#0:ba#8192:\
-	:pb#65190:ob#32595:\
-	:pc#1301415:oc#0:\
-	:pg#1203630:og#97785:
-
-Micropolis 1598-15:\
-	:ty#winchester:ns#70:nt#15:nc#1931:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#2027550:oc#0:\
-	:pg#1929900:og#97650:
-
-Micropolis 1624-7:\
-	:ty#winchester:ns#114:nt#7:nc#1647:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#1314306:oc#0:\
-	:pg#1216152:og#98154:
-
-Micropolis 1674-7:\
-	:ty#winchester:ns#35:nt#7:nc#1255:\
-	:pa#16415:oa#0:ba#8192:\
-	:pb#32830:ob#16415:\
-	:pc#307475:oc#0:\
-	:pg#258230:og#49245:
-
-Micropolis 1684-7:\
-	:ty#winchester:ns#53:nt#7:nc#1785:\
-	:pa#32648:oa#0:ba#8192:\
-	:pb#65296:ob#32648:\
-	:pc#662235:oc#0:\
-	:pg#564291:og#97944:
-
-Micropolis 1908-15:\
-	:ty#winchester:ns#95:nt#15:nc#1890:\
-	:pa#32775:oa#0:ba#8192:\
-	:pb#65550:ob#32775:\
-	:pc#2693250:oc#0:\
-	:pg#2594925:og#98325:
-
-Micropolis 1924-21:\
-	:ty#winchester:ns#94:nt#21:nc#2072:\
-	:pa#33558:oa#0:ba#8192:\
-	:pb#67116:ob#33558:\
-	:pc#4090128:oc#0:\
-	:pg#3989454:og#100674:
-
-Micropolis 1926-15:\
-	:ty#winchester:ns#101:nt#15:nc#2769:\
-	:pa#33330:oa#0:ba#8192:\
-	:pb#66660:ob#33330:\
-	:pc#4195035:oc#0:\
-	:pg#4095045:og#99990:
-
-Micropolis 1936-21:\
-	:ty#winchester:ns#101:nt#21:nc#2772:\
-	:pa#33936:oa#0:ba#8192:\
-	:pb#67872:ob#33936:\
-	:pc#5879412:oc#0:\
-	:pg#2846382:og#101808:\
-	:ph#2931222:oh#2948190:
-
-Micropolis 2105-8:\
-	:ty#winchester:ns#94:nt#8:nc#1448:\
-	:pa#32336:oa#0:ba#8192:\
-	:pb#64672:ob#32336:\
-	:pc#1088896:oc#0:\
-	:pg#991888:og#97008:
-
-Micropolis 2108-10:\
-	:ty#winchester:ns#94:nt#10:nc#1450:\
-	:pa#31960:oa#0:ba#8192:\
-	:pb#63920:ob#31960:\
-	:pc#1363000:oc#0:\
-	:pg#1267120:og#95880:
-
-Micropolis 2112-15:\
-	:ty#winchester:ns#94:nt#15:nc#1452:\
-	:pa#33840:oa#0:ba#8192:\
-	:pb#67680:ob#33840:\
-	:pc#2047320:oc#0:\
-	:pg#1945800:og#101520:
-
-Micropolis 2205-05:\
-	:ty#winchester:ns#109:nt#5:nc#2088:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#1137960:oc#0:\
-	:pg#1039860:og#98100:
-
-Micropolis 2210-09:\
-	:ty#winchester:ns#109:nt#9:nc#2099:\
-	:pa#33354:oa#0:ba#8192:\
-	:pb#66708:ob#33354:\
-	:pc#2059119:oc#0:\
-	:pg#1959057:og#100062:
-
-Micropolis 2217-15:\
-	:ty#winchester:ns#109:nt#15:nc#2105:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#3441675:oc#0:\
-	:pg#3343575:og#98100:
-
-Micropolis 4110:\
-	:ty#winchester:ns#114:nt#9:nc#1998:
-
-Micropolis 4221:\
-	:ty#winchester:ns#109:nt#9:nc#4079:\
-	:pa#4001499:oa#0:ba#8192:\
-	:pc#4001499:oc#0:
-
-NEC D2363:\
-	:ty#XD7053:ns#67:nt#27:nc#964:
-
-NEC-D2352:\
-	:ty#XD7053:ns#57:nt#19:nc#758:
-
-Quantum ELS 127S:\
-	:ty#winchester:ns#54:nt#3:nc#1541:
-
-Quantum ELS 170S:\
-	:ty#winchester:ns#54:nt#4:nc#1542:
-
-Quantum ELS 85S:\
-	:ty#winchester:ns#54:nt#2:nc#1535:
-
-Quantum Empire 540S:\
-	:ty#winchester:ns#92:nt#8:nc#1431:
-
-Quantum Empire 1080S:\
-	:ty#winchester:ns#92:nt#16:nc#1431:
-
-Quantum Empire 2100S:\
-	:ty#winchester:ns#137:nt#12:nc#2497:\
-	:pc#4105068:oc#0:
-
-Quantum GoDrive 120S:\
-	:ty#winchester:ns#56:nt#4:nc#1067:
-
-Quantum GoDrive 160S:\
-	:ty#winchester:ns#58:nt#4:nc#1413:
-
-Quantum LPS 105S:\
-	:ty#winchester:ns#42:nt#4:nc#1221:
-
-Quantum LPS 120S:\
-	:ty#winchester:ns#60:nt#2:nc#1987:
-
-Quantum LPS 240S:\
-	:ty#winchester:ns#60:nt#4:nc#1995:
-
-Quantum LPS 270S:\
-	:ty#winchester:ns#76:nt#7:nc#992:
-
-Quantum LPS 525S:\
-	:ty#winchester:ns#70:nt#6:nc#2444:
-
-Quantum LPS 540S:\
-	:ty#winchester:ns#125:nt#4:nc#2113:
-
-Quantum Lightning 730S:\
-	:ty#winchester:ns#63:nt#16:nc#1415:\
-	:pa#161280:oa#0:ba#8192:\
-	:pb#96768:ob#161280:\
-	:pc#1426320:oc#0:\
-	:pg#1168272:og#258048:
-
-Quantum PD 80S:\
-	:ty#winchester:ns#34:nt#6:nc#832:
-
-Quantum PD 120S:\
-	:ty#winchester:ns#42:nt#5:nc#1114:
-
-Quantum PD 170S:\
-	:ty#winchester:ns#42:nt#7:nc#1117:
-
-Quantum PD 210S:\
-	:ty#winchester:ns#49:nt#7:nc#1189:
-
-Quantum PD 425S:\
-	:ty#winchester:ns#60:nt#9:nc#1540:
-
-Quantum PD 700S:\
-	:ty#winchester:ns#70:nt#8:nc#2441:
-
-Quantum PD 1050iS:\
-	:ty#winchester:ns#92:nt#12:nc#1859:\
-	:pc#2052336:oc#0:
-
-Quantum PD 1050S:\
-	:ty#winchester:ns#70:nt#12:nc#2444:
-
-Quantum PD 1225S:\
-	:ty#winchester:ns#70:nt#14:nc#2442:
-
-Quantum XP32150:\
-	:ty#winchester:ns#109:nt#10:nc#3850:
-
-Quantum XP34301:\
-	:ty#winchester:ns#118:nt#20:nc#3561:
-
-Quantum XP34300W:\
-	:ty#winchester:ns#107:nt#20:nc#3907:
-
-RICOH RO-5031E:\
-	:ty#winchester:ns#54:nt#15:nc#710:\
-	:pc#575100:oc#0:
-
-RZ24:\
-	:ty#winchester:ns#38:nt#8:nc#1344:\
-	:pc#409792:oc#0:
-
-RZ55:\
-	:ty#winchester:ns#35:nt#15:nc#1218:\
-	:pa#32025:oa#0:ba#8192:\
-	:pb#59850:ob#32025:\
-	:pc#639450:oc#0:\
-	:pg#547575:og#91875:
-
-SEAGATE ST11950N:\
-	:ty#winchester:ns#81:nt#15:nc#2715:\
-	:pc#3298725:oc#0:
-
-SEAGATE ST15230N:\
-	:ty#winchester:ns#111:nt#19:nc#3974:
-
-SEAGATE ST31200N:\
-	:ty#winchester:ns#85:nt#9:nc#2692:
-
-SEAGATE ST31230N:\
-	:ty#winchester:ns#104:nt#5:nc#3978:\
-	:pc#2068560:oc#0:
-
-SEAGATE ST32550N:\
-	:ty#winchester:ns#109:nt#11:nc#3495:\
-	:pc#4190505:oc#0:
-
-SEAGATE ST3600N:\
-	:ty#winchester:ns#79:nt#7:nc#1853:\
-	:pc#1024709:oc#0:
-
-ST83220K:\
-	:ty#"ISP-80":ns#102:nt#19:nc#2652:
-
-SUN0104:\
-	:ty#winchester:ns#35:nt#6:nc#974:
-
-SUN0121:\
-	:ty#winchester:ns#39:nt#4:nc#1520:
-
-SUN0207:\
-	:ty#winchester:ns#36:nt#9:nc#1254:
-
-SUN0327:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-SUN0424:\
-	:ty#winchester:ns#80:nt#9:nc#1151:
-
-SUN0535:\
-	:ty#winchester:ns#80:nt#7:nc#1866:
-
-SUN0669:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-SUN1.3G:\
-	:ty#winchester:ns#80:nt#17:nc#1965:
-
-SUN2.1G:\
-	:ty#winchester:ns#80:nt#19:nc#2733:
-
-Sabre ST82500J:\
-	:ty#XD7053:ns#82:nt#19:nc#2609:
-
-Seagate (CDC) Wren V 94181-702:\
-	:ty#winchester:ns#48:nt#15:nc#1543:
-
-Seagate (CDC) Wren VI 94191-766:\
-	:ty#winchester:ns#52:nt#15:nc#1659:
-
-Seagate (CDC) Wren VII 94601-1.2G SunOS 4.1.1:\
-	:ty#winchester:ns#70:nt#15:nc#1925:
-
-Seagate (CDC) Wren VII 94601-15:\
-	:ty#winchester:ns#71:nt#15:nc#1905:
-
-Seagate (CDC) Wren VIII ST41650N:\
-	:ty#winchester:ns#89:nt#15:nc#2070:
-
-Seagate Elite ST43400N-3.5G:\
-	:ty#winchester:ns#99:nt#21:nc#2736:\
-	:pa#2843360:oa#0:ba#8192:\
-	:pb#2843360:ob#2841993:
-
-Seagate IPI ZBR Elite:\
-	:ty#"ISP-80":ns#78:nt#17:nc#1893:\
-	:pa#34476:oa#0:ba#8192:\
-	:pb#132600:ob#34476:\
-	:pc#2510118:oc#0:\
-	:pg#663000:og#167076:\
-	:ph#1680042:oh#830076:
-
-Seagate ST11200N:\
-	:ty#winchester:ns#80:nt#15:nc#1714:\
-	:pa#2056800:oa#0:ba#8192:\
-	:pc#2056800:oc#0:
-
-Seagate ST11900N:\
-	:ty#winchester:ns#83:nt#15:nc#2619:\
-	:pb#498000:ob#0:\
-	:pc#3260655:oc#0:\
-	:ph#2761410:oh#498000:
-
-Seagate ST1239N SWIFT:\
-	:ty#winchester:ns#35:nt#9:nc#1264:
-
-Seagate ST12400N 2.4GB:\
-	:ty#winchester:ns#82:nt#19:nc#2668:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#4156744:oc#0:\
-	:pg#4058590:og#98154:
-
-Seagate ST12550N:\
-	:ty#winchester:ns#80:nt#19:nc#2747:
-
-Seagate ST1480N:\
-	:ty#winchester:ns#64:nt#9:nc#1456:
-
-Seagate ST15150N:\
-	:ty#winchester:ns#78:nt#21:nc#5119:\
-	:pc#8384922:oc#0:
-
-Seagate ST410800N Elite 9:\
-	:ty#winchester:ns#108:nt#27:nc#6087:\
-	:pc#17749692:oc#0:
-
-Seagate ST42100N - Wren 9:\
-	:ty#winchester:ns#96:nt#15:nc#2574:\
-	:pc#3706560:oc#0:
-
-Seagate ST42400N Elite 2:\
-	:ty#winchester:ns#84:nt#19:nc#2604:\
-	:pc#4155984:oc#0:
-
-Seagate Sabre-5 ST81236J:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:\
-	:pa#99630:oa#0:ba#8192:\
-	:pb#261990:ob#99630:\
-	:pc#2008590:oc#0:\
-	:pd#548580:od#361620:\
-	:pe#1098390:oe#910200:\
-	:pf#361620:of#0:\
-	:pg#1646970:og#361620:\
-	:ph#1908960:oh#99630:
-
-SeagateST3283N:\
-	:ty#winchester:ns#57:nt#5:nc#1689:
-
-Sun1.0G:\
-	:ty#winchester:ns#80:nt#15:nc#1703:
-
-SyQuest SQ555:\
-	:ty#winchester:ns#34:nt#2:nc#1273:\
-	:pc#86564:oc#0:
-
-Toshiba MK 156F:\
-	:ty#winchester:ns#34:nt#10:nc#815:
-
-Vertex V185:\
-	:ty#ACB4000:ns#17:nt#7:nc#1163:
-
diff --git a/etc/etc.sparc64/disktab b/etc/etc.sparc64/disktab
index dff1b8c143a..169dc3c2dc9 100644
--- a/etc/etc.sparc64/disktab
+++ b/etc/etc.sparc64/disktab
@@ -1,21 +1,4 @@
-# $OpenBSD: disktab,v 1.12 2010/02/26 23:15:48 deraadt Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#
+# $OpenBSD: disktab,v 1.13 2010/07/02 20:33:54 tedu Exp $
 
 miniroot:\
 	:ty=winchester:se#512:nt#2:rm#300:ns#64:nc#90:\
@@ -49,837 +32,3 @@ fakeramdisk:\
 	:pa#5760:oa#0:ba#8192:fa#4096:ta=4.2BSD:\
 	:pc#5760:oc#0:
 
-ASI-1.0GIBM:\
-	:ty#winchester:ns#80:nt#15:nc#1632:
-
-Arte DEC DSP3160S:\
-	:ty#winchester:ns#112:nt#16:nc#1744:
-
-CDC 9720-850:\
-	:ty#XD7053:ns#66:nt#15:nc#1358:
-
-CDC EMD 9720:\
-	:ty#XD7053:ns#48:nt#10:nc#1147:
-
-CDC EMD 9720-1230:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:
-
-CDC IPI 9720:\
-	:ty#ISP-80:ns#82:nt#15:nc#1631:\
-	:pa#33210:oa#0:ba#8192:\
-	:pb#131610:ob#33210:\
-	:pc#2006130:oc#0:\
-	:pg#196800:og#164820:\
-	:ph#1644510:oh#361620:
-
-CDC IPI 9722:\
-	:ty#ISP-80:ns#156:nt#7:nc#1630:\
-	:pa#33852:oa#0:ba#8192:\
-	:pb#132132:ob#33852:\
-	:pc#1779960:oc#0:\
-	:pg#197652:og#165984:\
-	:ph#1416324:oh#363636:
-
-CDC Wren IV 94171-344:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-CONNER 30170E:\
-	:ty#winchester:ns#46:nt#8:nc#897:\
-	:pa#14720:oa#0:ba#8192:\
-	:pb#40480:ob#14720:\
-	:pc#330096:oc#0:\
-	:pg#274896:og#55200:
-
-CONNER 30200:\
-	:ty#winchester:ns#49:nt#4:nc#2121:\
-	:pc#415716:oc#0:
-
-CONNER CFP4207S  4.28GB:\
-	:ty#winchester:ns#125:nt#20:nc#3353:\
-	:pc#8382500:oc#0:
-
-CONNER CP3500-540MB-3.5:\
-	:ty#winchester:ns#50:nt#12:nc#1768:\
-	:pc#1060800:oc#0:
-
-CP3100:\
-	:ty#winchester:ns#49:nt#4:nc#1023:\
-	:pc#204864:oc#0:
-
-Conner CFP1060:\
-	:ty#winchester:ns#111:nt#8:nc#2329:
-
-Conner CP3540:\
-	:ty#winchester:ns#49:nt#12:nc#1805:
-
-DEC DSP3107L:\
-	:ty#winchester:ns#83:nt#8:nc#3147:\
-	:pc#2089608:oc#0:
-
-DEC DSP3210 2 GB:\
-	:ty#winchester:ns#86:nt#16:nc#3040:\
-	:pc#4183040:oc#0:
-
-DEC DSP5200:\
-	:ty#winchester:ns#71:nt#21:nc#2619:\
-	:pa#32802:oa#0:ba#8192:\
-	:pb#65604:ob#32802:\
-	:pc#3904929:oc#0:\
-	:pg#3806523:og#98406:
-
-DEC DSP5350:\
-	:ty#winchester:ns#91:nt#25:nc#3053:
-
-DEC_RZ26:\
-	:ty#winchester:ns#57:nt#14:nc#2568:\
-	:pa#66234:oa#0:ba#8192:\
-	:pb#132468:ob#66234:\
-	:pc#2049264:oc#0:\
-	:pg#1850562:og#198702:
-
-DEC_RZ28:\
-	:ty#winchester:ns#84:nt#16:nc#3043:\
-	:pa#64512:oa#0:ba#8192:\
-	:pb#196224:ob#64512:\
-	:pc#4089792:oc#0:\
-	:pg#3827712:og#260736:
-
-DEC_RZ58:\
-	:ty#winchester:ns#85:nt#15:nc#2112:
-
-DEC_RZ58_whole_disk:\
-	:\
-	:pc#2692800:oc#0:
-
-DEC_RZ74:\
-	:ty#winchester:ns#91:nt#25:nc#3053:\
-	:pa#65975:oa#0:ba#8192:\
-	:pb#193375:ob#65975:\
-	:pc#4192825:oc#0:\
-	:pg#3931200:og#259350:\
-	:ph#2752750:oh#4192825:
-
-Fujitsu M2243AS:\
-	:ty#ACB4000:ns#17:nt#11:nc#752:
-
-Fujitsu M2246E:\
-	:ty#winchester:ns#35:nt#6:nc#1196:\
-	:pa#16170:oa#0:ba#8192:\
-	:pb#28140:ob#16170:\
-	:pc#251160:oc#0:\
-	:pg#206850:og#44310:
-
-Fujitsu M2263SA:\
-	:ty#winchester:ns#53:nt#15:nc#1652:
-
-Fujitsu M2266SA 1.2GB:\
-	:ty#winchester:ns#85:nt#15:nc#1652:
-
-Fujitsu M2266SA 1GB:\
-	:ty#winchester:ns#85:nt#15:nc#1642:
-
-Fujitsu M2344K:\
-	:ty#XD7053:ns#64:nt#27:nc#622:
-
-Fujitsu M2511A:\
-	:ty#winchester:ns#25:nt#1:nc#9950:
-
-Fujitsu M2512A small:\
-	:ty#winchester:ns#25:nt#1:nc#9950:\
-	:pc#248750:oc#0:
-
-Fujitsu M2512A v2:\
-	:ty#winchester:ns#25:nt#1:nc#17840:\
-	:pc#446000:oc#0:
-
-Fujitsu M2622SA:\
-	:ty#winchester:ns#64:nt#7:nc#1429:\
-	:pc#640192:oc#0:
-
-Fujitsu M2624FA:\
-	:ty#winchester:ns#64:nt#11:nc#1440:\
-	:pa#22528:oa#0:ba#8192:\
-	:pb#67584:ob#22528:\
-	:pc#1013760:oc#0:\
-	:pg#450560:og#90112:\
-	:ph#473088:oh#540672:
-
-Fujitsu M2652SA:\
-	:ty#winchester:ns#88:nt#20:nc#1935:
-
-Fujitsu M2654SA:\
-	:ty#winchester:ns#88:nt#21:nc#2174:
-
-Fujitsu M2684S:\
-	:ty#SCSI:ns#74:nt#6:nc#2338:
-
-Fujitsu-M2284/M2322:\
-	:ty#XY450:ns#32:nt#10:nc#821:
-
-Fujitsu-M2312K:\
-	:ty#XY450:ns#32:nt#7:nc#587:
-
-Fujitsu-M2333:\
-	:ty#XD7053:ns#67:nt#10:nc#821:
-
-Fujitsu-M2351 Eagle:\
-	:ty#XD7053:ns#46:nt#20:nc#840:
-
-Fujitsu-M2361 Eagle:\
-	:ty#XD7053:ns#67:nt#20:nc#840:
-
-Fujitsu-M2372K:\
-	:ty#XD7053:ns#67:nt#27:nc#743:
-
-Fujitsu-M2382:\
-	:ty#XD7053:ns#81:nt#27:nc#743:\
-	:pa#80919:oa#0:ba#8192:\
-	:pb#129033:ob#80919:\
-	:pc#1624941:oc#0:\
-	:pd#470205:od#209952:\
-	:pe#944784:oe#680157:\
-	:pf#209952:of#0:\
-	:pg#1414989:og#209952:\
-	:ph#1544022:oh#80919:
-
-Fujitsu-M2624S-512:\
-	:ty#winchester:ns#64:nt#11:nc#1429:
-
-Fujitsu-M2651SA:\
-	:ty#winchester:ns#88:nt#16:nc#1934:\
-	:pc#2723072:oc#0:
-
-Fujitsu-M2694ESA:\
-	:ty#winchester:ns#77:nt#15:nc#1830:
-
-HP 97549T:\
-	:ty#winchester:ns#64:nt#16:nc#1909:
-
-HP 97556:\
-	:ty#winchester:ns#72:nt#11:nc#1668:
-
-HP 97558:\
-	:ty#winchester:ns#72:nt#15:nc#1933:
-
-HP 97560:\
-	:ty#winchester:ns#72:nt#19:nc#1933:
-
-HP C2247 1.05GB:\
-	:ty#winchester:ns#95:nt#13:nc#1661:\
-	:pc#2051335:oc#0:\
-	:pg#1640080:og#0:\
-	:ph#411255:oh#1640080:
-
-HP C3010 / Cranel 2.0GB Fast SCSI2 H10:\
-	:ty#winchester:ns#95:nt#19:nc#2165:
-
-HP97548SU 664MB:\
-	:ty#winchester:ns#56:nt#16:nc#1445:\
-	:pa#35840:oa#0:ba#8192:\
-	:pb#71680:ob#35840:\
-	:pc#1294720:oc#0:\
-	:pg#197120:og#215040:\
-	:ph#342720:oh#609280:
-
-Hewlett Packard C2490A:\
-	:ty#winchester:ns#107:nt#18:nc#2159:
-
-Hewlett Packard C3323A:\
-	:ty#winchester:ns#98:nt#7:nc#2995:
-
-Hewlett Packard C3725S:\
-	:ty#winchester:ns#140:nt#9:nc#3362:\
-	:pc#4236120:oc#0:\
-	:ph#4193280:oh#1260:
-
-Hitachi DK315C-10:\
-	:ty#winchester:ns#75:nt#11:nc#2467:
-
-Hitachi DK315C-11:\
-	:ty#winchester:ns#58:nt#15:nc#2478:
-
-Hitachi DK315C-14:\
-	:ty#winchester:ns#75:nt#15:nc#2462:
-
-Hitachi DK326C-10:\
-	:ty#winchester:ns#87:nt#7:nc#3200:
-
-Hitachi DK326C-6:\
-	:ty#winchester:ns#87:nt#4:nc#3200:
-
-Hitachi DK515C-78:\
-	:ty#winchester:ns#69:nt#14:nc#1354:
-
-Hitachi DK516C-16:\
-	:ty#winchester:ns#80:nt#15:nc#2170:
-
-Hitachi DK517C-37:\
-	:ty#winchester:ns#81:nt#21:nc#3297:
-
-Hitachi DK815-10:\
-	:ty#XD7053:ns#67:nt#15:nc#1735:
-
-IBM 0662-S12:\
-	:ty#winchester:ns#114:nt#6:nc#3002:
-
-IBM 0662S12:\
-	:ty#winchester:ns#108:nt#5:nc#3803:
-
-IBM 0663-E15:\
-	:ty#winchester:ns#37:nt#20:nc#3182:
-
-IBM 0663L12:\
-	:ty#winchester:ns#66:nt#15:nc#1979:\
-	:pc#1959210:oc#0:
-
-IBM 0664-M1H/N1H:\
-	:ty#winchester:ns#86:nt#16:nc#2856:
-
-IBM 0664CSH:\
-	:ty#winchester:ns#125:nt#30:nc#2787:
-
-IBM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM DFHSS1x:\
-	:ty#winchester:ns#125:nt#4:nc#4383:
-
-IBM DFHSS2x:\
-	:ty#winchester:ns#125:nt#8:nc#4388:
-
-IBM DFHSS4x:\
-	:ty#winchester:ns#125:nt#16:nc#4390:
-
-IBM DPES-31080:\
-	:ty#winchester:ns#108:nt#4:nc#4901:\
-	:pc#2117232:oc#0:
-
-IBM DSAS-3270:\
-	:ty#winchester:ns#108:nt#2:nc#2542:
-
-IBM DSAS-3360:\
-	:ty#winchester:ns#108:nt#2:nc#3297:
-
-IBM DSAS-3540:\
-	:ty#winchester:ns#108:nt#3:nc#3259:
-
-IBM DSAS-3720:\
-	:ty#winchester:ns#108:nt#4:nc#3292:
-
-IBM OEM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM OEM DFHSS2F:\
-	:ty#winchester:ns#135:nt#8:nc#4076:\
-	:pa#4100760:oa#0:ba#8192:\
-	:pb#301320:ob#4100760:
-
-MAXOPTIX (NON-ISO, 1024b) DATA:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 1024b) SYSTEM:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 512b) DATA:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MAXOPTIX (NON-ISO, 512b) SYSTEM:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MICROP 4221-09MZ  10204:\
-	:ty#winchester:ns#139:nt#9:nc#3198:\
-	:pc#4000698:oc#0:
-
-MICROPOLIS 1991-27:\
-	:ty#winchester:ns#149:nt#27:nc#4400:
-
-MICROPOLIS 3243-19:\
-	:ty#winchester:ns#106:nt#19:nc#4139:
-
-MICROPOLIS 4110-09:\
-	:ty#winchester:ns#95:nt#9:nc#2283:
-
-Maxtor 7213SR NB:\
-	:ty#winchester:ns#65:nt#4:nc#1595:\
-	:pc#414700:oc#0:\
-	:pg#414700:og#0:
-
-Maxtor DXP3105S:\
-	:ty#winchester:ns#57:nt#14:nc#2568:
-
-Maxtor LXT-200S:\
-	:ty#winchester:ns#43:nt#7:nc#1117:
-
-Maxtor LXT-340SY:\
-	:ty#winchester:ns#70:nt#7:nc#1355:
-
-Maxtor LXT535ST:\
-	:ty#winchester:ns#61:nt#11:nc#1547:\
-	:pc#1038037:oc#0:
-
-Maxtor MXT1240S:\
-	:ty#winchester:ns#70:nt#15:nc#2306:\
-	:pc#2421300:oc#0:\
-	:pg#2421300:og#0:
-
-Maxtor P0-12S (1632):\
-	:ty#winchester:ns#90:nt#15:nc#1478:\
-	:pc#1995300:oc#0:\
-	:pg#1995300:og#0:
-
-Maxtor P0-12S (1795):\
-	:ty#winchester:ns#90:nt#15:nc#1510:\
-	:pc#2038500:oc#0:\
-	:pg#2038500:og#0:
-
-Maxtor P1-17S:\
-	:ty#winchester:ns#83:nt#19:nc#1816:\
-	:pa#78850:oa#0:ba#8192:\
-	:pb#78850:ob#78850:\
-	:pc#2863832:oc#0:\
-	:pd#78850:od#157700:\
-	:pg#2469582:og#236550:\
-	:ph#78850:oh#2706132:
-
-Maxtor P1-17S NB:\
-	:ty#winchester:ns#90:nt#19:nc#1711:\
-	:pc#2925810:oc#0:\
-	:pg#2925810:og#0:
-
-Maxtor XT-1050:\
-	:ty#ACB4000:ns#17:nt#5:nc#1020:
-
-Maxtor XT-3280S:\
-	:ty#winchester:ns#25:nt#15:nc#1222:
-
-Maxtor XT-4380S:\
-	:ty#winchester:ns#36:nt#15:nc#1202:
-
-Maxtor XT-8380S:\
-	:ty#winchester:ns#53:nt#8:nc#1626:
-
-Maxtor XT-8610E:\
-	:ty#winchester:ns#52:nt#12:nc#1626:
-
-Maxtor XT-8760E:\
-	:ty#winchester:ns#50:nt#15:nc#1616:\
-	:pa#97500:oa#0:ba#8192:\
-	:pb#63750:ob#658500:\
-	:pc#1212000:oc#0:\
-	:pd#280500:od#97500:\
-	:pe#280500:oe#378000:\
-	:pf#489750:of#722250:\
-	:pg#561000:og#97500:\
-	:ph#658500:oh#0:
-
-Maxtor XT-8760S:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-Micropolis 1304:\
-	:ty#ACB4000:ns#17:nt#6:nc#825:
-
-Micropolis 1325:\
-	:ty#ACB4000:ns#17:nt#8:nc#1022:
-
-Micropolis 1355:\
-	:ty#winchester:ns#34:nt#8:nc#1018:
-
-Micropolis 1528-15:\
-	:ty#winchester:ns#83:nt#15:nc#2102:\
-	:pa#32370:oa#0:ba#8192:\
-	:pb#64740:ob#32370:\
-	:pc#2616990:oc#0:\
-	:pg#2519880:og#97110:
-
-Micropolis 1548-15:\
-	:ty#winchester:ns#131:nt#15:nc#1701:\
-	:pa#33405:oa#0:ba#8192:\
-	:pb#66810:ob#33405:\
-	:pc#3342465:oc#0:\
-	:pg#3242250:og#100215:
-
-Micropolis 1558:\
-	:ty#winchester:ns#35:nt#15:nc#1218:
-
-Micropolis 1578-15:\
-	:ty#winchester:ns#35:nt#15:nc#1231:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#646275:oc#0:\
-	:pg#548625:og#97650:
-
-Micropolis 1588-15:\
-	:ty#winchester:ns#53:nt#15:nc#1637:\
-	:pa#32595:oa#0:ba#8192:\
-	:pb#65190:ob#32595:\
-	:pc#1301415:oc#0:\
-	:pg#1203630:og#97785:
-
-Micropolis 1598-15:\
-	:ty#winchester:ns#70:nt#15:nc#1931:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#2027550:oc#0:\
-	:pg#1929900:og#97650:
-
-Micropolis 1624-7:\
-	:ty#winchester:ns#114:nt#7:nc#1647:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#1314306:oc#0:\
-	:pg#1216152:og#98154:
-
-Micropolis 1674-7:\
-	:ty#winchester:ns#35:nt#7:nc#1255:\
-	:pa#16415:oa#0:ba#8192:\
-	:pb#32830:ob#16415:\
-	:pc#307475:oc#0:\
-	:pg#258230:og#49245:
-
-Micropolis 1684-7:\
-	:ty#winchester:ns#53:nt#7:nc#1785:\
-	:pa#32648:oa#0:ba#8192:\
-	:pb#65296:ob#32648:\
-	:pc#662235:oc#0:\
-	:pg#564291:og#97944:
-
-Micropolis 1908-15:\
-	:ty#winchester:ns#95:nt#15:nc#1890:\
-	:pa#32775:oa#0:ba#8192:\
-	:pb#65550:ob#32775:\
-	:pc#2693250:oc#0:\
-	:pg#2594925:og#98325:
-
-Micropolis 1924-21:\
-	:ty#winchester:ns#94:nt#21:nc#2072:\
-	:pa#33558:oa#0:ba#8192:\
-	:pb#67116:ob#33558:\
-	:pc#4090128:oc#0:\
-	:pg#3989454:og#100674:
-
-Micropolis 1926-15:\
-	:ty#winchester:ns#101:nt#15:nc#2769:\
-	:pa#33330:oa#0:ba#8192:\
-	:pb#66660:ob#33330:\
-	:pc#4195035:oc#0:\
-	:pg#4095045:og#99990:
-
-Micropolis 1936-21:\
-	:ty#winchester:ns#101:nt#21:nc#2772:\
-	:pa#33936:oa#0:ba#8192:\
-	:pb#67872:ob#33936:\
-	:pc#5879412:oc#0:\
-	:pg#2846382:og#101808:\
-	:ph#2931222:oh#2948190:
-
-Micropolis 2105-8:\
-	:ty#winchester:ns#94:nt#8:nc#1448:\
-	:pa#32336:oa#0:ba#8192:\
-	:pb#64672:ob#32336:\
-	:pc#1088896:oc#0:\
-	:pg#991888:og#97008:
-
-Micropolis 2108-10:\
-	:ty#winchester:ns#94:nt#10:nc#1450:\
-	:pa#31960:oa#0:ba#8192:\
-	:pb#63920:ob#31960:\
-	:pc#1363000:oc#0:\
-	:pg#1267120:og#95880:
-
-Micropolis 2112-15:\
-	:ty#winchester:ns#94:nt#15:nc#1452:\
-	:pa#33840:oa#0:ba#8192:\
-	:pb#67680:ob#33840:\
-	:pc#2047320:oc#0:\
-	:pg#1945800:og#101520:
-
-Micropolis 2205-05:\
-	:ty#winchester:ns#109:nt#5:nc#2088:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#1137960:oc#0:\
-	:pg#1039860:og#98100:
-
-Micropolis 2210-09:\
-	:ty#winchester:ns#109:nt#9:nc#2099:\
-	:pa#33354:oa#0:ba#8192:\
-	:pb#66708:ob#33354:\
-	:pc#2059119:oc#0:\
-	:pg#1959057:og#100062:
-
-Micropolis 2217-15:\
-	:ty#winchester:ns#109:nt#15:nc#2105:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#3441675:oc#0:\
-	:pg#3343575:og#98100:
-
-Micropolis 4110:\
-	:ty#winchester:ns#114:nt#9:nc#1998:
-
-Micropolis 4221:\
-	:ty#winchester:ns#109:nt#9:nc#4079:\
-	:pa#4001499:oa#0:ba#8192:\
-	:pc#4001499:oc#0:
-
-NEC D2363:\
-	:ty#XD7053:ns#67:nt#27:nc#964:
-
-NEC-D2352:\
-	:ty#XD7053:ns#57:nt#19:nc#758:
-
-Quantum ELS 127S:\
-	:ty#winchester:ns#54:nt#3:nc#1541:
-
-Quantum ELS 170S:\
-	:ty#winchester:ns#54:nt#4:nc#1542:
-
-Quantum ELS 85S:\
-	:ty#winchester:ns#54:nt#2:nc#1535:
-
-Quantum Empire 540S:\
-	:ty#winchester:ns#92:nt#8:nc#1431:
-
-Quantum Empire 1080S:\
-	:ty#winchester:ns#92:nt#16:nc#1431:
-
-Quantum Empire 2100S:\
-	:ty#winchester:ns#137:nt#12:nc#2497:\
-	:pc#4105068:oc#0:
-
-Quantum GoDrive 120S:\
-	:ty#winchester:ns#56:nt#4:nc#1067:
-
-Quantum GoDrive 160S:\
-	:ty#winchester:ns#58:nt#4:nc#1413:
-
-Quantum LPS 105S:\
-	:ty#winchester:ns#42:nt#4:nc#1221:
-
-Quantum LPS 120S:\
-	:ty#winchester:ns#60:nt#2:nc#1987:
-
-Quantum LPS 240S:\
-	:ty#winchester:ns#60:nt#4:nc#1995:
-
-Quantum LPS 270S:\
-	:ty#winchester:ns#76:nt#7:nc#992:
-
-Quantum LPS 525S:\
-	:ty#winchester:ns#70:nt#6:nc#2444:
-
-Quantum LPS 540S:\
-	:ty#winchester:ns#125:nt#4:nc#2113:
-
-Quantum Lightning 730S:\
-	:ty#winchester:ns#63:nt#16:nc#1415:\
-	:pa#161280:oa#0:ba#8192:\
-	:pb#96768:ob#161280:\
-	:pc#1426320:oc#0:\
-	:pg#1168272:og#258048:
-
-Quantum PD 80S:\
-	:ty#winchester:ns#34:nt#6:nc#832:
-
-Quantum PD 120S:\
-	:ty#winchester:ns#42:nt#5:nc#1114:
-
-Quantum PD 170S:\
-	:ty#winchester:ns#42:nt#7:nc#1117:
-
-Quantum PD 210S:\
-	:ty#winchester:ns#49:nt#7:nc#1189:
-
-Quantum PD 425S:\
-	:ty#winchester:ns#60:nt#9:nc#1540:
-
-Quantum PD 700S:\
-	:ty#winchester:ns#70:nt#8:nc#2441:
-
-Quantum PD 1050iS:\
-	:ty#winchester:ns#92:nt#12:nc#1859:\
-	:pc#2052336:oc#0:
-
-Quantum PD 1050S:\
-	:ty#winchester:ns#70:nt#12:nc#2444:
-
-Quantum PD 1225S:\
-	:ty#winchester:ns#70:nt#14:nc#2442:
-
-Quantum XP32150:\
-	:ty#winchester:ns#109:nt#10:nc#3850:
-
-Quantum XP34301:\
-	:ty#winchester:ns#118:nt#20:nc#3561:
-
-Quantum XP34300W:\
-	:ty#winchester:ns#107:nt#20:nc#3907:
-
-RICOH RO-5031E:\
-	:ty#winchester:ns#54:nt#15:nc#710:\
-	:pc#575100:oc#0:
-
-RZ24:\
-	:ty#winchester:ns#38:nt#8:nc#1344:\
-	:pc#409792:oc#0:
-
-RZ55:\
-	:ty#winchester:ns#35:nt#15:nc#1218:\
-	:pa#32025:oa#0:ba#8192:\
-	:pb#59850:ob#32025:\
-	:pc#639450:oc#0:\
-	:pg#547575:og#91875:
-
-SEAGATE ST11950N:\
-	:ty#winchester:ns#81:nt#15:nc#2715:\
-	:pc#3298725:oc#0:
-
-SEAGATE ST15230N:\
-	:ty#winchester:ns#111:nt#19:nc#3974:
-
-SEAGATE ST31200N:\
-	:ty#winchester:ns#85:nt#9:nc#2692:
-
-SEAGATE ST31230N:\
-	:ty#winchester:ns#104:nt#5:nc#3978:\
-	:pc#2068560:oc#0:
-
-SEAGATE ST32550N:\
-	:ty#winchester:ns#109:nt#11:nc#3495:\
-	:pc#4190505:oc#0:
-
-SEAGATE ST3600N:\
-	:ty#winchester:ns#79:nt#7:nc#1853:\
-	:pc#1024709:oc#0:
-
-ST83220K:\
-	:ty#"ISP-80":ns#102:nt#19:nc#2652:
-
-SUN0104:\
-	:ty#winchester:ns#35:nt#6:nc#974:
-
-SUN0121:\
-	:ty#winchester:ns#39:nt#4:nc#1520:
-
-SUN0207:\
-	:ty#winchester:ns#36:nt#9:nc#1254:
-
-SUN0327:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-SUN0424:\
-	:ty#winchester:ns#80:nt#9:nc#1151:
-
-SUN0535:\
-	:ty#winchester:ns#80:nt#7:nc#1866:
-
-SUN0669:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-SUN1.3G:\
-	:ty#winchester:ns#80:nt#17:nc#1965:
-
-SUN2.1G:\
-	:ty#winchester:ns#80:nt#19:nc#2733:
-
-Sabre ST82500J:\
-	:ty#XD7053:ns#82:nt#19:nc#2609:
-
-Seagate (CDC) Wren V 94181-702:\
-	:ty#winchester:ns#48:nt#15:nc#1543:
-
-Seagate (CDC) Wren VI 94191-766:\
-	:ty#winchester:ns#52:nt#15:nc#1659:
-
-Seagate (CDC) Wren VII 94601-1.2G SunOS 4.1.1:\
-	:ty#winchester:ns#70:nt#15:nc#1925:
-
-Seagate (CDC) Wren VII 94601-15:\
-	:ty#winchester:ns#71:nt#15:nc#1905:
-
-Seagate (CDC) Wren VIII ST41650N:\
-	:ty#winchester:ns#89:nt#15:nc#2070:
-
-Seagate Elite ST43400N-3.5G:\
-	:ty#winchester:ns#99:nt#21:nc#2736:\
-	:pa#2843360:oa#0:ba#8192:\
-	:pb#2843360:ob#2841993:
-
-Seagate IPI ZBR Elite:\
-	:ty#"ISP-80":ns#78:nt#17:nc#1893:\
-	:pa#34476:oa#0:ba#8192:\
-	:pb#132600:ob#34476:\
-	:pc#2510118:oc#0:\
-	:pg#663000:og#167076:\
-	:ph#1680042:oh#830076:
-
-Seagate ST11200N:\
-	:ty#winchester:ns#80:nt#15:nc#1714:\
-	:pa#2056800:oa#0:ba#8192:\
-	:pc#2056800:oc#0:
-
-Seagate ST11900N:\
-	:ty#winchester:ns#83:nt#15:nc#2619:\
-	:pb#498000:ob#0:\
-	:pc#3260655:oc#0:\
-	:ph#2761410:oh#498000:
-
-Seagate ST1239N SWIFT:\
-	:ty#winchester:ns#35:nt#9:nc#1264:
-
-Seagate ST12400N 2.4GB:\
-	:ty#winchester:ns#82:nt#19:nc#2668:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#4156744:oc#0:\
-	:pg#4058590:og#98154:
-
-Seagate ST12550N:\
-	:ty#winchester:ns#80:nt#19:nc#2747:
-
-Seagate ST1480N:\
-	:ty#winchester:ns#64:nt#9:nc#1456:
-
-Seagate ST15150N:\
-	:ty#winchester:ns#78:nt#21:nc#5119:\
-	:pc#8384922:oc#0:
-
-Seagate ST410800N Elite 9:\
-	:ty#winchester:ns#108:nt#27:nc#6087:\
-	:pc#17749692:oc#0:
-
-Seagate ST42100N - Wren 9:\
-	:ty#winchester:ns#96:nt#15:nc#2574:\
-	:pc#3706560:oc#0:
-
-Seagate ST42400N Elite 2:\
-	:ty#winchester:ns#84:nt#19:nc#2604:\
-	:pc#4155984:oc#0:
-
-Seagate Sabre-5 ST81236J:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:\
-	:pa#99630:oa#0:ba#8192:\
-	:pb#261990:ob#99630:\
-	:pc#2008590:oc#0:\
-	:pd#548580:od#361620:\
-	:pe#1098390:oe#910200:\
-	:pf#361620:of#0:\
-	:pg#1646970:og#361620:\
-	:ph#1908960:oh#99630:
-
-SeagateST3283N:\
-	:ty#winchester:ns#57:nt#5:nc#1689:
-
-Sun1.0G:\
-	:ty#winchester:ns#80:nt#15:nc#1703:
-
-SyQuest SQ555:\
-	:ty#winchester:ns#34:nt#2:nc#1273:\
-	:pc#86564:oc#0:
-
-Toshiba MK 156F:\
-	:ty#winchester:ns#34:nt#10:nc#815:
-
-Vertex V185:\
-	:ty#ACB4000:ns#17:nt#7:nc#1163:
-
diff --git a/etc/etc.vax/disktab b/etc/etc.vax/disktab
index 6938bb6ca4f..6bc13034782 100644
--- a/etc/etc.vax/disktab
+++ b/etc/etc.vax/disktab
@@ -1,497 +1,5 @@
-#	$OpenBSD: disktab,v 1.13 2009/05/07 17:03:22 deraadt Exp $
-#	$NetBSD: disktab,v 1.2 1996/03/05 12:01:53 ragge Exp $
-#
-#	@(#)disktab	8.1 (Berkeley) 6/9/93
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	dt	controller type
-#	ty	type of disk (fixed, removable, simulated)
-#	d[0-4]	drive-type-dependent parameters
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	sc	#sectors/cylinder, nc*nt default
-#	su	#sectors/unit, sc*nc default
-#	se	sector size, DEV_BSIZE default
-#	rm	rpm, 3600 default
-#	sf	supports bad144-style bad sector forwarding
-#	sk	sector skew per track, default 0
-#	cs	sector skew per cylinder, default 0
-#	hs	headswitch time, default 0
-#	ts	one-cylinder seek time, default 0
-#	il	sector interleave (n:1), 1 default
-#	bs	boot block size, default BBSIZE
-#	sb	superblock size, default SBSIZE
-#	o[a-p]	partition offsets in sectors
-#	p[a-p]	partition sizes in sectors
-#	b[a-p]	partition block sizes in bytes
-#	f[a-p]	partition fragment sizes in bytes
-#	t[a-p]	partition types (filesystem, swap, etc)
-#	b[0-1]	primary and secondary bootstraps, optional
-#
-# WARNING:
-# On drives that contain bad-sector replacement areas,
-# `c' partitions DO overlap the bad-sector replacements.
-# This may change again.
-# Other partitions do not overlap the bad-sector replacement area.
-#
-# Existing entries may also be used for other compatible drives
-# with the same geometry.
+#	$OpenBSD: disktab,v 1.14 2010/07/02 20:33:54 tedu Exp $
 
-#
-# Drives on hp
-#
-# drive-type parameters for SMD disks:
-#	d0	binary flags: 1=skip-sector support (RM80)
-#	d1	mindist (closest #sectors from desired for starting transfer)
-#	d2	maxdist (farthest #sectors from desired for starting transfer)
-#	d3	sdist (distance from desired sector for search)
-# NOTE: c partitions include bad-sector replacement areas!
-rm03|RM03|DEC RM03:\
-	:ty=removable:ns#32:nt#5:nc#823:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16000:bb#8192:fb#1024:tb=swap:\
-	:pc#131680:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#49440:bd#4096:fd#512:\
-	:pe#55936:oe#65440:be#8192:fe#1024:\
-	:pf#10080:of#121440:bf#8192:ff#1024:\
-	:pg#82080:og#49440:bg#8192:fg#1024:
-#	:pc#131520:oc#0:bc#8192:fc#1024:
-rm05|RM05|DEC RM05:\
-	:ty=removable:ns#32:nt#19:nc#823:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16416:bb#8192:fb#1024:tb=swap:\
-	:pc#500384:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#341696:bd#4096:fd#512:\
-	:pe#55936:oe#358112:be#8192:fe#1024:\
-	:pf#86176:of#414048:bf#8192:ff#1024:\
-	:pg#158528:og#341696:bg#8192:fg#1024:\
-	:ph#291346:oh#49856:bh#8192:fh#1024:
-#	:pc#500224:oc#0:bc#8192:fc#1024:
-rp06|RP06|DEC RP06:\
-	:ty=removable:ns#22:nt#19:nc#815:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#15884:bb#8192:fb#1024:tb=swap:\
-	:pc#340670:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#49324:bd#4096:fd#512:\
-	:pe#55936:oe#65208:be#8192:fe#1024:\
-	:pf#219296:of#121220:bf#8192:ff#1024:\
-	:pg#291192:og#49324:bg#8192:fg#1024:
-#	:pc#340516:oc#0:bc#8192:fc#1024:
-rm80|RM80|DEC RM80:\
-	:ty=winchester:ns#31:nt#14:nc#559:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16058:bb#8192:fb#1024:tb=swap:\
-	:pc#242606:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#49910:bd#4096:fd#512:\
-	:pe#55936:oe#65968:be#8192:fe#1024:\
-	:pf#120466:of#121954:bf#8192:ff#1024:\
-	:pg#192510:og#49910:bg#8192:fg#1024:
-#	:pc#242420:oc#0:bc#8192:fc#1024:
-rp05|RP05|DEC RP05:\
-	:ty=removable:ns#22:nt#19:nc#411:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#15884:bb#8192:fb#1024:tb=swap:\
-	:pc#171798:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#49324:bd#4096:fd#512:\
-	:pe#55936:oe#65208:be#8192:fe#1024:\
-	:pf#50424:of#121220:bf#8192:ff#1024:\
-	:pg#122320:og#49324:bg#8192:fg#1024:
-#	:pc#171644:oc#0:bc#8192:fc#1024:
-rp07|RP07|DEC RP07:\
-	:ty=winchester:ns#50:nt#32:nc#630:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16000:bb#8192:fb#1024:tb=swap:\
-	:pc#1008000:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#376000:bd#4096:fd#512:\
-	:pe#307200:oe#392000:be#8192:fe#1024:\
-	:pf#308600:of#699200:bf#8192:ff#1024:\
-	:pg#631800:og#376000:bg#8192:fg#1024:\
-	:ph#291346:oh#83200:bh#8192:fh#1024:
-#	:pc#1007800:oc#0:bc#8192:fc#1024:
-ml11|ml11a|ml11b|ML11A|ML11B|DEC disk emulator:\
-	:ty=simulated:dt=SMD:ns#1:nt#1:nc#2000:
-9775|CDC 9775:\
-	:ty=winchester:ns#32:nt#40:nc#842:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16640:bb#8192:fb#1024:tb=swap:\
-	:pc#1077760:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#376320:bd#4096:fd#512:\
-	:pe#307200:oe#392960:be#8192:fe#1024:\
-	:pf#377440:of#700160:bf#8192:ff#1024:\
-	:pg#701280:og#376320:bg#8192:fg#1024:\
-	:ph#291346:oh#84480:bh#8192:fh#1024:
-#	:pc#1077600:oc#0:bc#8192:fc#1024:
-9730|CDC 9730:\
-	:ty=removable:ns#32:nt#10:nc#823:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16000:bb#8192:fb#1024:tb=swap:\
-	:pc#263360:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#49600:bd#4096:fd#512:\
-	:pe#55936:oe#65600:be#8192:fe#1024:\
-	:pf#141600:of#121600:bf#8192:ff#1024:\
-	:pg#213600:og#49600:bg#8192:fg#1024:
-#	:pc#263200:oc#0:bc#8192:fc#1024:
-capricorn|330|Capricorn|Ampex Capricorn:\
-	:ty=winchester:ns#32:nt#16:nc#1024:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16384:bb#8192:fb#1024:tb=swap:\
-	:pc#524488:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#342016:bd#4096:fd#512:\
-	:pe#55936:oe#358400:be#8192:fe#1024:\
-	:pf#109408:of#414720:bf#8192:ff#1024:\
-	:pg#182112:og#342016:bg#8192:fg#1024:\
-	:ph#291346:oh#50176:bh#8192:fh#1024:
-#	:pc#524128:oc#0:bc#8192:fc#1024:
-eagle|Eagle|2351|2351A|Fujitsu Eagle 2351A (48 sectors):\
-	:ty=winchester:ns#48:nt#20:nc#842:rm#3961:sf:\
-	:dt=smd:d0#0:d1#6:d2#17:d3#7:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16320:bb#8192:fb#1024:tb=swap:\
-	:pc#808320:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#375360:bd#4096:fd#512:\
-	:pe#307200:oe#391680:be#8192:fe#1024:\
-	:pf#109248:of#698880:bf#8192:ff#1024:\
-	:pg#432768:og#375360:bg#8192:fg#1024:\
-	:ph#291346:oh#83520:bh#8192:fh#1024:
-#	:pc#808128:oc#0:bc#8192:fc#1024:
-2361|doubleeagle|Fujitsu 2361 (Double Eagle, 64 sectors):\
-	:ty=winchester:ns#64:nt#20:nc#842:sf:\
-	:dt=smd:d0#0:d1#6:d2#17:d3#7:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16640:bb#8192:fb#1024:tb=swap:\
-	:pc#1077760:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#376320:bd#4096:fd#512:\
-	:pe#307200:oe#392960:be#8192:fe#1024:\
-	:pf#377408:of#700160:bf#8192:ff#1024:\
-	:pg#701248:og#376320:bg#8192:fg#1024:\
-	:ph#291346:oh#84480:bh#8192:fh#1024:
-#	:pc#1077568:oc#0:bc#8192:fc#1024:
-
-2361a|doubleeagle|Fujitsu 2361 (Double Eagle, 68 sectors):\
-	:ty=winchester:ns#68:nt#20:nc#842:sf:\
-	:dt=smd:d0#0:d1#6:d2#17:d3#7:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16320:bb#8192:fb#1024:tb=swap:\
-	:pc#1145120:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#376720:bd#4096:fd#512:\
-	:pe#307200:oe#393040:be#8192:fe#1024:\
-	:pf#444516:of#700400:bf#8192:ff#1024:\
-	:pg#768196:og#376720:bg#8192:fg#1024:\
-	:ph#291346:oh#84320:bh#8192:fh#1024:
-#	:pc#1144916:oc#0:bc#8192:fc#1024:
-#
-# IDC disks
-#
-# RL02/RB02 have 256-byte sectors,
-# but partitions are still in units of 512-byte sectors
-rb02|RB02|DEC RL02 on 730 IDC:\
-	:ty=removable:se#256:ns#40:nt#2:nc#512:\
-	:dt=old DEC:\
-	:pa#15884:oa#0:ba#4096:fa#1024:\
-	:pb#4480:ob#16000:bb#4096:fb#512:tb=swap:\
-	:pc#20480:oc#0:bc#4096:fc#512:
-rb80|RB80|DEC R80 on 730 IDC:\
-	:ty=winchester:ns#31:nt#14:nc#559:\
-	:dt=old DEC:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16058:bb#8192:fb#1024:tb=swap:\
-	:pc#242606:oc#0:bc#8192:fc#1024:\
-	:pg#82080:og#49910:bg#4096:fg#512:\
-	:ph#192696:oh#132270:bh#8192:fh#1024:
-#
-# Disks for rk
-#
-rk06|RK06|DEC RK06:\
-	:ty=removable:ns#22:nt#3:nc#411:sf:\
-	:dt=old DEC:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#11154:ob#15906:bb#4096:fb#512:tb=swap:\
-	:pc#27126:oc#0:bc#4096:fc#512:
-#	:pc#26978:oc#0:bc#4096:fc#512:
-rk07|RK07|DEC RK07:\
-	:ty=removable:ns#22:nt#3:nc#815:sf:\
-	:dt=old DEC:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#10032:ob#15906:bb#8192:fb#1024:tb=swap:\
-	:pc#53790:oc#0:bc#4096:fc#512:\
-	:pd#15884:od#25938:bd#4096:fd#512:\
-	:pf#11792:of#41844:bf#4096:ff#1024:\
-	:pg#27698:og#25938:bg#4096:fg#512:
-#	:pc#53636:oc#0:bc#4096:fc#512:
-#
-# Disks normally on up
-#
-160|fuji|fuji160|Fujitsu 160:\
-	:ty=winchester:ns#32:nt#10:nc#823:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16000:bb#8192:fb#1024:tb=swap:\
-	:pc#263360:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#49600:bd#4096:fd#512:\
-	:pe#55936:oe#65600:be#8192:fe#1024:\
-	:pf#141600:of#121600:bf#8192:ff#1024:\
-	:pg#213600:og#49600:bg#8192:fg#1024:
-#	:pc#263200:oc#0:bc#8192:fc#1024:
-9300|Ampex 9300:\
-	:ty=removable:ns#32:nt#19:nc#815:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16416:bb#8192:fb#1024:tb=swap:\
-	:pc#495520:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#341696:bd#4096:fd#512:\
-	:pe#55936:oe#358112:be#8192:fe#1024:\
-	:pf#81312:of#414048:bf#8192:ff#1024:\
-	:pg#153664:og#341696:bg#8192:fg#1024:\
-	:ph#291346:oh#49856:bh#8192:fh#1024:
-#	:pc#495360:oc#0:bc#8192:fc#1024:
-9766|CDC 9766:\
-	:ty=removable:ns#32:nt#19:nc#823:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16416:bb#8192:fb#1024:tb=swap:\
-	:pc#500384:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#341696:bd#4096:fd#512:\
-	:pe#55936:oe#358112:be#8192:fe#1024:\
-	:pf#86176:of#414048:bf#8192:ff#1024:\
-	:pg#158528:og#341696:bg#8192:fg#1024:\
-	:ph#291346:oh#49856:bh#8192:fh#1024:
-#	:pc#500224:oc#0:bc#8192:fc#1024:
-980|9762|AMPEX DM980|CDC 9762:\
-	:ty=removable:ns#32:nt#5:nc#823:sf:\
-	:dt=smd:d0#0:d1#3:d2#10:d3#6:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#16000:bb#8192:fb#1024:tb=swap:\
-	:pc#131680:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#49440:bd#4096:fd#512:\
-	:pe#55936:oe#65440:be#8192:fe#1024:\
-	:pf#10080:of#121440:bf#8192:ff#1024:\
-	:pg#82080:og#49440:bg#8192:fg#1024:
-#	:pc#131520:oc#0:bc#8192:fc#1024:
-#
-# Disk on a UDA50
-# NOTE: new partition sizes since 4.2.
-#
-# RA60: standard use a-b-f
-#	4.2 compatible use a-b-d-e where 4.2 g == d; 4.2 h == e
-#	UCB compatible use a-b-h-g where UCB h == h; UCB g == g
-ra60|RA60|DEC RA60 Removable:\
-	:ty=removable:ns#42:nt#4:nc#2382:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#15884:bb#8192:fb#1024:tb=swap:\
-	:pc#400176:oc#0:bc#8192:fc#1024:\
-	:pd#82080:od#49324:bd#4096:fd#512:\
-	:pe#268772:oe#131404:be#4096:fe#512:\
-	:pf#350852:of#49324:bf#4096:ff#512:\
-	:pg#157570:og#242606:bg#4096:fg#1024:\
-	:ph#193282:oh#49324:bh#4096:fh#512:
-#
-# RA80: standard use a-b-g
-#	4.2 compatible use a-b-f-h where 4.2 g == f; 4.2 h == h
-#	UCB compatible use a-b-e where UCB h == e
-ra80|RA80|DEC RA80 Winchester:\
-	:ty=winchester:ns#31:nt#14:nc#546:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#15884:bb#8192:fb#1024:tb=swap:\
-	:pc#236964:oc#0:bc#8192:fc#1024:\
-	:pe#187640:oe#49324:be#4096:fe#512:\
-	:pf#82080:of#49324:bf#4096:ff#512:\
-	:pg#187054:og#49910:bg#4096:fg#1024:\
-	:ph#105560:oh#131404:bh#4096:fh#512:
-#
-# RA81: standard use a-b-h-g or a-b-h-d-e-f
-#	When compiled as COMPAT_42 d-e-f are used for 4.2 compatible as:
-#		4.2 g == d; 4.2 h == e; 4.2 f == f
-ra81|RA81|DEC RA81 Winchester:\
-	:ty=winchester:ns#51:nt#14:nc#1248:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16422:bb#8192:fb#1024:tb=swap:\
-	:pc#891072:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#375564:bd#4096:fd#512:\
-	:pe#307200:oe#391986:be#8192:fe#1024:\
-	:pf#191352:of#699720:bf#8192:ff#1024:\
-	:pg#515508:og#375564:bg#8192:fg#1024:\
-	:ph#291346:oh#83538:bh#8192:fh#1024:
-# RACOMPAT RA81: should you need to create more of these awful partitions
-#	When compiled as RACOMPAT d-e-f are used for 4.2 compatible as:
-#		4.2 g == d; 4.2 h == e; 4.2 f == f
-racompat81|compat_42ra81|COMPAT_42RA81|DEC COMPAT_42RA81 Winchester:\
-	:ty=winchester:ns#51:nt#14:nc#1248:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16422:bb#8192:fb#1024:tb=swap:\
-	:pc#891072:oc#0:bc#8192:fc#1024:\
-	:pd#82080:od#49324:bd#4096:fd#512:\
-	:pe#759668:oe#131404:be#4096:fe#512:\
-	:pf#478582:of#412490:bf#4096:ff#512:
-	:pg#515508:og#375564:bg#8192:fg#1024:\
-	:ph#291346:oh#83538:bh#8192:fh#1024:
-#
-# UCB RA81: use a-b-h-g or a-b-h-d-e-f
-ucbra81|UCBRA81|DEC UCBRA81 Winchester:\
-	:ty=winchester:ns#51:nt#14:nc#1248:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#15884:bb#4096:fb#512:tb=swap:\
-	:pc#891072:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#242606:bd#4096:fd#512:\
-	:pe#307200:oe#258490:be#8192:fe#1024:\
-	:pf#325382:of#565690:bf#4096:ff#512:\
-	:pg#648466:og#242606:bg#4096:fg#1024:\
-	:ph#193282:oh#49324:bh#4096:fh#512:
-#
-# RA82: standard, use a-b-h-g or a-b-h-d-e-f
-ra82|RA82|DEC RA82 Winchester:\
-	:ty=winchester:ns#57:nt#15:nc#1423:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16245:bb#8192:fb#1024:tb=swap:\
-	:pc#1216665:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#375345:bd#4096:fd#512:\
-	:pe#307200:oe#391590:be#8192:fe#1024:\
-	:pf#517275:of#699390:bf#8192:ff#1024:\
-	:pg#841320:og#375345:bg#8192:fg#1024:\
-	:ph#291346:oh#83790:bh#8192:fh#1024:
-#
-# RA90
-ra90|RA90|DEC RA90 Winchester:\
-	:ty=winchester:ns#69:nt#13:nc#2649:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16146:bb#8192:fb#1024:tb=swap:\
-	:pc#2376153:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#374946:bd#4096:fd#512:\
-	:pe#307200:oe#391092:be#8192:fe#1024:\
-	:pf#1677390:of#698763:bf#8192:ff#1024:\
-	:pg#2001207:og#374946:bg#8192:fg#1024:\
-	:ph#291346:oh#83421:bh#8192:fh#1024:
-#
-# RA92
-ra92|RA92|DEC RA92 Winchester:\
-	:ty=winchester:ns#69:nt#13:nc#3279:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#16146:bb#8192:fb#1024:tb=swap:\
-	:pc#2941263:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#374946:bd#4096:fd#512:\
-	:pe#307200:oe#391092:be#8192:fe#1024:\
-	:pf#2242500:of#698763:bf#8192:ff#1024:\
-	:pg#2566317:og#374946:bg#8192:fg#1024:\
-	:ph#291346:oh#83421:bh#8192:fh#1024:
-#
-# RA70
-ra70|RA70|DEC RA70:\
-	:ty=winchester:ns#33:nt#11:nc#1507:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#15972:bb#8192:fb#1024:tb=swap:\
-	:pc#547041:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#341220:bd#4096:fd#512:\
-	:pe#55936:oe#357192:be#8192:fe#1024:\
-	:pf#133584:of#413457:bf#8192:ff#1024:\
-	:pg#205821:og#341220:bg#8192:fg#1024:\
-	:ph#291346:oh#49731:bh#8192:fh#1024:
-#
-# RC25
-rc25|RC25:\
-	:ty=winchester:ns#42:nt#4:nc#302:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#10032:ob#15884:bb#8192:fb#1024:tb=swap:\
-	:pc#50736:oc#0:bc#8192:fc#1024:\
-	:pg#24820:og#25916:bg#8192:fg#1024:
-#
-#  Disks on RQDX Q-bus controllers
-rd52|RD52|DEC RD52 on Microvax:\
-	:ty=winchester:ns#18:nt#7:nc#480:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#4096:fa#1024:\
-	:pb#9766:ob#15884:bb#4096:fb#512:tb=swap:\
-	:pc#60480:oc#0:bc#4096:fc#512:\
-	:pg#34830:og#25650:bg#4096:fg#512:\
-	:b0=rdboot:
-#
-rd53|RD53|DEC RD53 on Microvax:\
-	:ty=winchester:ns#18:nt#8:nc#963:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#15884:bb#4096:fb#512:tb=swap:\
-	:pc#138672:oc#0:bc#4096:fc#512:\
-	:pe#33440:oe#0:be#4096:fe#512:\
-	:pf#105232:of#33440:bf#4096:ff#512:\
-	:pg#89348:og#49324:bg#4096:fg#512:\
-	:ph#122788:oh#15884:bh#4096:fh#512:\
-	:b0=rdboot:
-#
-rd54|RD54|DEC RD54 on Microvax:\
-	:ty=winchester:ns#17:nt#15:nc#1225:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#33440:ob#15884:bb#8192:fb#1024:tb=swap:\
-	:pc#311200:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#49324:bd#4096:fd#512:\
-	:pe#55936:oe#65208:be#8192:fe#1024:\
-	:pf#190485:of#121144:bf#8192:ff#1024:\
-	:pg#261876:og#49324:bg#8192:fg#1024:\
-	:b0=rdboot:
-#
-qdeagle|qd-eagle|Fujitsu 2351A eagle on QD33 (Microvax):\
-	:ty=winchester:ns#47:nt#20:nc#840:\
-	:dt=MSCP:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#15980:bb#8192:fb#1024:tb=swap:\
-	:pc#787156:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#375060:bd#4096:fd#512:\
-	:pe#307200:oe#391040:be#8192:fe#1024:\
-	:pf#88736:of#698420:bf#8192:ff#1024:\
-	:pg#412096:og#375060:bg#8192:fg#1024:\
-	:ph#291346:oh#83660:bh#8192:fh#1024:\
-	:b0=rdboot:
-#
-# RX02 floppy disk drives
-#
-rx02|RX02|DEC RX02:\
-	:ty=removable:ns#13:nt#1:nc#77:\
-	:dt=floppy:\
-	:pa#1001:oa#0:ba#4096:fa#512:
-
-ncc|nec800|800 Mb NEC:\
-	:ty=winchester:ns#66:nt#23:nc#850:rm#3600:se#512:\
-	:dt=SMD:\
-	:d0#0:d1#40960:\
-	:pa#97152:oa#0:ba#8192:fa#1024:\
-	:pb#92598:ob#97152:bb#8192:fb#1024:tb=swap:\
-	:pc#1092960:oc#189750:bc#8192:fc#1024:\
-	:ph#1282710:oh#0:bh#8192:fh#1024:
-
-ncc2|nec2363|1Gb NEC:\
-	:ty=winchester:ns#64:nt#27:nc#1024:rm#3600:se#512:\
-	:dt=SMD:\
-	:d0#0:\
-	:pa#15884:oa#0:ba#8192:fa#1024:\
-	:pb#66880:ob#17280:bb#8192:fb#1024:tb=swap:\
-	:pc#1769472:oc#0:bc#8192:fc#1024:\
-	:pd#15884:od#376704:bd#4096:fd#512:\
-	:pe#307200:oe#393984:be#8192:fe#1024:\
-	:pf#1067904:of#701568:bf#8192:ff#1024:\
-	:pg#1392768:og#376704:bg#8192:fg#1024:\
-	:ph#291346:oh#84672:bh#8192:fh#1024:
-#
-# Special disktab entries used when creating distributions.
-#
 bootroot|fake-type used in install boot:\
 	:ty=fake:se#512:nt#1:rm#10:ns#512:nc#1:\
 	:pa#512:oa#0:ba#4096:fa#512:\
diff --git a/etc/etc.zaurus/disktab b/etc/etc.zaurus/disktab
index 5475db864a3..00cc17c757e 100644
--- a/etc/etc.zaurus/disktab
+++ b/etc/etc.zaurus/disktab
@@ -1,22 +1,4 @@
-# $OpenBSD: disktab,v 1.2 2005/01/14 04:36:16 deraadt Exp $
-#
-#	@(#)disktab	5.5 (Berkeley) 2/27/91
-#
-# Disk geometry and partition layout tables.
-# Key:
-#	ty	type of disk
-#	ns	#sectors/track
-#	nt	#tracks/cylinder
-#	nc	#cylinders/disk
-#	rm	rpm, 3600 default
-#	se	sector size, 512 default
-#	sf	supports bad144-style bad sector forwarding
-#	so	partition offsets in sectors
-#	p[a-h]	partition sizes in sectors
-#	b[a-h]	partition block sizes in bytes
-#	f[a-h]	partition fragment sizes in bytes
-#
-
+# $OpenBSD: disktab,v 1.3 2010/07/02 20:33:54 tedu Exp $
 
 # Leave nc=16; adjust size using: ns
 rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -42,834 +24,3 @@ floppy|floppy3|3in|3.5in High Density Floppy:\
 	:pb#2880:ob#0:\
 	:pc#2880:oc#0:
 
-ASI-1.0GIBM:\
-	:ty#winchester:ns#80:nt#15:nc#1632:
-
-Arte DEC DSP3160S:\
-	:ty#winchester:ns#112:nt#16:nc#1744:
-
-CDC 9720-850:\
-	:ty#XD7053:ns#66:nt#15:nc#1358:
-
-CDC EMD 9720:\
-	:ty#XD7053:ns#48:nt#10:nc#1147:
-
-CDC EMD 9720-1230:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:
-
-CDC IPI 9720:\
-	:ty#ISP-80:ns#82:nt#15:nc#1631:\
-	:pa#33210:oa#0:ba#8192:\
-	:pb#131610:ob#33210:\
-	:pc#2006130:oc#0:\
-	:pg#196800:og#164820:\
-	:ph#1644510:oh#361620:
-
-CDC IPI 9722:\
-	:ty#ISP-80:ns#156:nt#7:nc#1630:\
-	:pa#33852:oa#0:ba#8192:\
-	:pb#132132:ob#33852:\
-	:pc#1779960:oc#0:\
-	:pg#197652:og#165984:\
-	:ph#1416324:oh#363636:
-
-CDC Wren IV 94171-344:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-CONNER 30170E:\
-	:ty#winchester:ns#46:nt#8:nc#897:\
-	:pa#14720:oa#0:ba#8192:\
-	:pb#40480:ob#14720:\
-	:pc#330096:oc#0:\
-	:pg#274896:og#55200:
-
-CONNER 30200:\
-	:ty#winchester:ns#49:nt#4:nc#2121:\
-	:pc#415716:oc#0:
-
-CONNER CFP4207S  4.28GB:\
-	:ty#winchester:ns#125:nt#20:nc#3353:\
-	:pc#8382500:oc#0:
-
-CONNER CP3500-540MB-3.5:\
-	:ty#winchester:ns#50:nt#12:nc#1768:\
-	:pc#1060800:oc#0:
-
-CP3100:\
-	:ty#winchester:ns#49:nt#4:nc#1023:\
-	:pc#204864:oc#0:
-
-Conner CFP1060:\
-	:ty#winchester:ns#111:nt#8:nc#2329:
-
-Conner CP3540:\
-	:ty#winchester:ns#49:nt#12:nc#1805:
-
-DEC DSP3107L:\
-	:ty#winchester:ns#83:nt#8:nc#3147:\
-	:pc#2089608:oc#0:
-
-DEC DSP3210 2 GB:\
-	:ty#winchester:ns#86:nt#16:nc#3040:\
-	:pc#4183040:oc#0:
-
-DEC DSP5200:\
-	:ty#winchester:ns#71:nt#21:nc#2619:\
-	:pa#32802:oa#0:ba#8192:\
-	:pb#65604:ob#32802:\
-	:pc#3904929:oc#0:\
-	:pg#3806523:og#98406:
-
-DEC DSP5350:\
-	:ty#winchester:ns#91:nt#25:nc#3053:
-
-DEC_RZ26:\
-	:ty#winchester:ns#57:nt#14:nc#2568:\
-	:pa#66234:oa#0:ba#8192:\
-	:pb#132468:ob#66234:\
-	:pc#2049264:oc#0:\
-	:pg#1850562:og#198702:
-
-DEC_RZ28:\
-	:ty#winchester:ns#84:nt#16:nc#3043:\
-	:pa#64512:oa#0:ba#8192:\
-	:pb#196224:ob#64512:\
-	:pc#4089792:oc#0:\
-	:pg#3827712:og#260736:
-
-DEC_RZ58:\
-	:ty#winchester:ns#85:nt#15:nc#2112:
-
-DEC_RZ58_whole_disk:\
-	:\
-	:pc#2692800:oc#0:
-
-DEC_RZ74:\
-	:ty#winchester:ns#91:nt#25:nc#3053:\
-	:pa#65975:oa#0:ba#8192:\
-	:pb#193375:ob#65975:\
-	:pc#4192825:oc#0:\
-	:pg#3931200:og#259350:\
-	:ph#2752750:oh#4192825:
-
-Fujitsu M2243AS:\
-	:ty#ACB4000:ns#17:nt#11:nc#752:
-
-Fujitsu M2246E:\
-	:ty#winchester:ns#35:nt#6:nc#1196:\
-	:pa#16170:oa#0:ba#8192:\
-	:pb#28140:ob#16170:\
-	:pc#251160:oc#0:\
-	:pg#206850:og#44310:
-
-Fujitsu M2263SA:\
-	:ty#winchester:ns#53:nt#15:nc#1652:
-
-Fujitsu M2266SA 1.2GB:\
-	:ty#winchester:ns#85:nt#15:nc#1652:
-
-Fujitsu M2266SA 1GB:\
-	:ty#winchester:ns#85:nt#15:nc#1642:
-
-Fujitsu M2344K:\
-	:ty#XD7053:ns#64:nt#27:nc#622:
-
-Fujitsu M2511A:\
-	:ty#winchester:ns#25:nt#1:nc#9950:
-
-Fujitsu M2512A small:\
-	:ty#winchester:ns#25:nt#1:nc#9950:\
-	:pc#248750:oc#0:
-
-Fujitsu M2512A v2:\
-	:ty#winchester:ns#25:nt#1:nc#17840:\
-	:pc#446000:oc#0:
-
-Fujitsu M2622SA:\
-	:ty#winchester:ns#64:nt#7:nc#1429:\
-	:pc#640192:oc#0:
-
-Fujitsu M2624FA:\
-	:ty#winchester:ns#64:nt#11:nc#1440:\
-	:pa#22528:oa#0:ba#8192:\
-	:pb#67584:ob#22528:\
-	:pc#1013760:oc#0:\
-	:pg#450560:og#90112:\
-	:ph#473088:oh#540672:
-
-Fujitsu M2652SA:\
-	:ty#winchester:ns#88:nt#20:nc#1935:
-
-Fujitsu M2654SA:\
-	:ty#winchester:ns#88:nt#21:nc#2174:
-
-Fujitsu M2684S:\
-	:ty#SCSI:ns#74:nt#6:nc#2338:
-
-Fujitsu-M2284/M2322:\
-	:ty#XY450:ns#32:nt#10:nc#821:
-
-Fujitsu-M2312K:\
-	:ty#XY450:ns#32:nt#7:nc#587:
-
-Fujitsu-M2333:\
-	:ty#XD7053:ns#67:nt#10:nc#821:
-
-Fujitsu-M2351 Eagle:\
-	:ty#XD7053:ns#46:nt#20:nc#840:
-
-Fujitsu-M2361 Eagle:\
-	:ty#XD7053:ns#67:nt#20:nc#840:
-
-Fujitsu-M2372K:\
-	:ty#XD7053:ns#67:nt#27:nc#743:
-
-Fujitsu-M2382:\
-	:ty#XD7053:ns#81:nt#27:nc#743:\
-	:pa#80919:oa#0:ba#8192:\
-	:pb#129033:ob#80919:\
-	:pc#1624941:oc#0:\
-	:pd#470205:od#209952:\
-	:pe#944784:oe#680157:\
-	:pf#209952:of#0:\
-	:pg#1414989:og#209952:\
-	:ph#1544022:oh#80919:
-
-Fujitsu-M2624S-512:\
-	:ty#winchester:ns#64:nt#11:nc#1429:
-
-Fujitsu-M2651SA:\
-	:ty#winchester:ns#88:nt#16:nc#1934:\
-	:pc#2723072:oc#0:
-
-Fujitsu-M2694ESA:\
-	:ty#winchester:ns#77:nt#15:nc#1830:
-
-HP 97549T:\
-	:ty#winchester:ns#64:nt#16:nc#1909:
-
-HP 97556:\
-	:ty#winchester:ns#72:nt#11:nc#1668:
-
-HP 97558:\
-	:ty#winchester:ns#72:nt#15:nc#1933:
-
-HP 97560:\
-	:ty#winchester:ns#72:nt#19:nc#1933:
-
-HP C2247 1.05GB:\
-	:ty#winchester:ns#95:nt#13:nc#1661:\
-	:pc#2051335:oc#0:\
-	:pg#1640080:og#0:\
-	:ph#411255:oh#1640080:
-
-HP C3010 / Cranel 2.0GB Fast SCSI2 H10:\
-	:ty#winchester:ns#95:nt#19:nc#2165:
-
-HP97548SU 664MB:\
-	:ty#winchester:ns#56:nt#16:nc#1445:\
-	:pa#35840:oa#0:ba#8192:\
-	:pb#71680:ob#35840:\
-	:pc#1294720:oc#0:\
-	:pg#197120:og#215040:\
-	:ph#342720:oh#609280:
-
-Hewlett Packard C2490A:\
-	:ty#winchester:ns#107:nt#18:nc#2159:
-
-Hewlett Packard C3323A:\
-	:ty#winchester:ns#98:nt#7:nc#2995:
-
-Hewlett Packard C3725S:\
-	:ty#winchester:ns#140:nt#9:nc#3362:\
-	:pc#4236120:oc#0:\
-	:ph#4193280:oh#1260:
-
-Hitachi DK315C-10:\
-	:ty#winchester:ns#75:nt#11:nc#2467:
-
-Hitachi DK315C-11:\
-	:ty#winchester:ns#58:nt#15:nc#2478:
-
-Hitachi DK315C-14:\
-	:ty#winchester:ns#75:nt#15:nc#2462:
-
-Hitachi DK326C-10:\
-	:ty#winchester:ns#87:nt#7:nc#3200:
-
-Hitachi DK326C-6:\
-	:ty#winchester:ns#87:nt#4:nc#3200:
-
-Hitachi DK515C-78:\
-	:ty#winchester:ns#69:nt#14:nc#1354:
-
-Hitachi DK516C-16:\
-	:ty#winchester:ns#80:nt#15:nc#2170:
-
-Hitachi DK517C-37:\
-	:ty#winchester:ns#81:nt#21:nc#3297:
-
-Hitachi DK815-10:\
-	:ty#XD7053:ns#67:nt#15:nc#1735:
-
-IBM 0662-S12:\
-	:ty#winchester:ns#114:nt#6:nc#3002:
-
-IBM 0662S12:\
-	:ty#winchester:ns#108:nt#5:nc#3803:
-
-IBM 0663-E15:\
-	:ty#winchester:ns#37:nt#20:nc#3182:
-
-IBM 0663L12:\
-	:ty#winchester:ns#66:nt#15:nc#1979:\
-	:pc#1959210:oc#0:
-
-IBM 0664-M1H/N1H:\
-	:ty#winchester:ns#86:nt#16:nc#2856:
-
-IBM 0664CSH:\
-	:ty#winchester:ns#125:nt#30:nc#2787:
-
-IBM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM DFHSS1x:\
-	:ty#winchester:ns#125:nt#4:nc#4383:
-
-IBM DFHSS2x:\
-	:ty#winchester:ns#125:nt#8:nc#4388:
-
-IBM DFHSS4x:\
-	:ty#winchester:ns#125:nt#16:nc#4390:
-
-IBM DPES-31080:\
-	:ty#winchester:ns#108:nt#4:nc#4901:\
-	:pc#2117232:oc#0:
-
-IBM DSAS-3270:\
-	:ty#winchester:ns#108:nt#2:nc#2542:
-
-IBM DSAS-3360:\
-	:ty#winchester:ns#108:nt#2:nc#3297:
-
-IBM DSAS-3540:\
-	:ty#winchester:ns#108:nt#3:nc#3259:
-
-IBM DSAS-3720:\
-	:ty#winchester:ns#108:nt#4:nc#3292:
-
-IBM OEM 0664M1H:\
-	:ty#winchester:ns#94:nt#15:nc#2787:
-
-IBM OEM DFHSS2F:\
-	:ty#winchester:ns#135:nt#8:nc#4076:\
-	:pa#4100760:oa#0:ba#8192:\
-	:pb#301320:ob#4100760:
-
-MAXOPTIX (NON-ISO, 1024b) DATA:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 1024b) SYSTEM:\
-	:ty#winchester:ns#66:nt#1:nc#15104:
-
-MAXOPTIX (NON-ISO, 512b) DATA:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MAXOPTIX (NON-ISO, 512b) SYSTEM:\
-	:ty#winchester:ns#60:nt#1:nc#15081:
-
-MICROP 4221-09MZ  10204:\
-	:ty#winchester:ns#139:nt#9:nc#3198:\
-	:pc#4000698:oc#0:
-
-MICROPOLIS 1991-27:\
-	:ty#winchester:ns#149:nt#27:nc#4400:
-
-MICROPOLIS 3243-19:\
-	:ty#winchester:ns#106:nt#19:nc#4139:
-
-MICROPOLIS 4110-09:\
-	:ty#winchester:ns#95:nt#9:nc#2283:
-
-Maxtor 7213SR NB:\
-	:ty#winchester:ns#65:nt#4:nc#1595:\
-	:pc#414700:oc#0:\
-	:pg#414700:og#0:
-
-Maxtor DXP3105S:\
-	:ty#winchester:ns#57:nt#14:nc#2568:
-
-Maxtor LXT-200S:\
-	:ty#winchester:ns#43:nt#7:nc#1117:
-
-Maxtor LXT-340SY:\
-	:ty#winchester:ns#70:nt#7:nc#1355:
-
-Maxtor LXT535ST:\
-	:ty#winchester:ns#61:nt#11:nc#1547:\
-	:pc#1038037:oc#0:
-
-Maxtor MXT1240S:\
-	:ty#winchester:ns#70:nt#15:nc#2306:\
-	:pc#2421300:oc#0:\
-	:pg#2421300:og#0:
-
-Maxtor P0-12S (1632):\
-	:ty#winchester:ns#90:nt#15:nc#1478:\
-	:pc#1995300:oc#0:\
-	:pg#1995300:og#0:
-
-Maxtor P0-12S (1795):\
-	:ty#winchester:ns#90:nt#15:nc#1510:\
-	:pc#2038500:oc#0:\
-	:pg#2038500:og#0:
-
-Maxtor P1-17S:\
-	:ty#winchester:ns#83:nt#19:nc#1816:\
-	:pa#78850:oa#0:ba#8192:\
-	:pb#78850:ob#78850:\
-	:pc#2863832:oc#0:\
-	:pd#78850:od#157700:\
-	:pg#2469582:og#236550:\
-	:ph#78850:oh#2706132:
-
-Maxtor P1-17S NB:\
-	:ty#winchester:ns#90:nt#19:nc#1711:\
-	:pc#2925810:oc#0:\
-	:pg#2925810:og#0:
-
-Maxtor XT-1050:\
-	:ty#ACB4000:ns#17:nt#5:nc#1020:
-
-Maxtor XT-3280S:\
-	:ty#winchester:ns#25:nt#15:nc#1222:
-
-Maxtor XT-4380S:\
-	:ty#winchester:ns#36:nt#15:nc#1202:
-
-Maxtor XT-8380S:\
-	:ty#winchester:ns#53:nt#8:nc#1626:
-
-Maxtor XT-8610E:\
-	:ty#winchester:ns#52:nt#12:nc#1626:
-
-Maxtor XT-8760E:\
-	:ty#winchester:ns#50:nt#15:nc#1616:\
-	:pa#97500:oa#0:ba#8192:\
-	:pb#63750:ob#658500:\
-	:pc#1212000:oc#0:\
-	:pd#280500:od#97500:\
-	:pe#280500:oe#378000:\
-	:pf#489750:of#722250:\
-	:pg#561000:og#97500:\
-	:ph#658500:oh#0:
-
-Maxtor XT-8760S:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-Micropolis 1304:\
-	:ty#ACB4000:ns#17:nt#6:nc#825:
-
-Micropolis 1325:\
-	:ty#ACB4000:ns#17:nt#8:nc#1022:
-
-Micropolis 1355:\
-	:ty#winchester:ns#34:nt#8:nc#1018:
-
-Micropolis 1528-15:\
-	:ty#winchester:ns#83:nt#15:nc#2102:\
-	:pa#32370:oa#0:ba#8192:\
-	:pb#64740:ob#32370:\
-	:pc#2616990:oc#0:\
-	:pg#2519880:og#97110:
-
-Micropolis 1548-15:\
-	:ty#winchester:ns#131:nt#15:nc#1701:\
-	:pa#33405:oa#0:ba#8192:\
-	:pb#66810:ob#33405:\
-	:pc#3342465:oc#0:\
-	:pg#3242250:og#100215:
-
-Micropolis 1558:\
-	:ty#winchester:ns#35:nt#15:nc#1218:
-
-Micropolis 1578-15:\
-	:ty#winchester:ns#35:nt#15:nc#1231:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#646275:oc#0:\
-	:pg#548625:og#97650:
-
-Micropolis 1588-15:\
-	:ty#winchester:ns#53:nt#15:nc#1637:\
-	:pa#32595:oa#0:ba#8192:\
-	:pb#65190:ob#32595:\
-	:pc#1301415:oc#0:\
-	:pg#1203630:og#97785:
-
-Micropolis 1598-15:\
-	:ty#winchester:ns#70:nt#15:nc#1931:\
-	:pa#32550:oa#0:ba#8192:\
-	:pb#65100:ob#32550:\
-	:pc#2027550:oc#0:\
-	:pg#1929900:og#97650:
-
-Micropolis 1624-7:\
-	:ty#winchester:ns#114:nt#7:nc#1647:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#1314306:oc#0:\
-	:pg#1216152:og#98154:
-
-Micropolis 1674-7:\
-	:ty#winchester:ns#35:nt#7:nc#1255:\
-	:pa#16415:oa#0:ba#8192:\
-	:pb#32830:ob#16415:\
-	:pc#307475:oc#0:\
-	:pg#258230:og#49245:
-
-Micropolis 1684-7:\
-	:ty#winchester:ns#53:nt#7:nc#1785:\
-	:pa#32648:oa#0:ba#8192:\
-	:pb#65296:ob#32648:\
-	:pc#662235:oc#0:\
-	:pg#564291:og#97944:
-
-Micropolis 1908-15:\
-	:ty#winchester:ns#95:nt#15:nc#1890:\
-	:pa#32775:oa#0:ba#8192:\
-	:pb#65550:ob#32775:\
-	:pc#2693250:oc#0:\
-	:pg#2594925:og#98325:
-
-Micropolis 1924-21:\
-	:ty#winchester:ns#94:nt#21:nc#2072:\
-	:pa#33558:oa#0:ba#8192:\
-	:pb#67116:ob#33558:\
-	:pc#4090128:oc#0:\
-	:pg#3989454:og#100674:
-
-Micropolis 1926-15:\
-	:ty#winchester:ns#101:nt#15:nc#2769:\
-	:pa#33330:oa#0:ba#8192:\
-	:pb#66660:ob#33330:\
-	:pc#4195035:oc#0:\
-	:pg#4095045:og#99990:
-
-Micropolis 1936-21:\
-	:ty#winchester:ns#101:nt#21:nc#2772:\
-	:pa#33936:oa#0:ba#8192:\
-	:pb#67872:ob#33936:\
-	:pc#5879412:oc#0:\
-	:pg#2846382:og#101808:\
-	:ph#2931222:oh#2948190:
-
-Micropolis 2105-8:\
-	:ty#winchester:ns#94:nt#8:nc#1448:\
-	:pa#32336:oa#0:ba#8192:\
-	:pb#64672:ob#32336:\
-	:pc#1088896:oc#0:\
-	:pg#991888:og#97008:
-
-Micropolis 2108-10:\
-	:ty#winchester:ns#94:nt#10:nc#1450:\
-	:pa#31960:oa#0:ba#8192:\
-	:pb#63920:ob#31960:\
-	:pc#1363000:oc#0:\
-	:pg#1267120:og#95880:
-
-Micropolis 2112-15:\
-	:ty#winchester:ns#94:nt#15:nc#1452:\
-	:pa#33840:oa#0:ba#8192:\
-	:pb#67680:ob#33840:\
-	:pc#2047320:oc#0:\
-	:pg#1945800:og#101520:
-
-Micropolis 2205-05:\
-	:ty#winchester:ns#109:nt#5:nc#2088:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#1137960:oc#0:\
-	:pg#1039860:og#98100:
-
-Micropolis 2210-09:\
-	:ty#winchester:ns#109:nt#9:nc#2099:\
-	:pa#33354:oa#0:ba#8192:\
-	:pb#66708:ob#33354:\
-	:pc#2059119:oc#0:\
-	:pg#1959057:og#100062:
-
-Micropolis 2217-15:\
-	:ty#winchester:ns#109:nt#15:nc#2105:\
-	:pa#32700:oa#0:ba#8192:\
-	:pb#65400:ob#32700:\
-	:pc#3441675:oc#0:\
-	:pg#3343575:og#98100:
-
-Micropolis 4110:\
-	:ty#winchester:ns#114:nt#9:nc#1998:
-
-Micropolis 4221:\
-	:ty#winchester:ns#109:nt#9:nc#4079:\
-	:pa#4001499:oa#0:ba#8192:\
-	:pc#4001499:oc#0:
-
-NEC D2363:\
-	:ty#XD7053:ns#67:nt#27:nc#964:
-
-NEC-D2352:\
-	:ty#XD7053:ns#57:nt#19:nc#758:
-
-QUANTUM EMPIRE_2100S:\
-	:ty#winchester:ns#137:nt#12:nc#2497:\
-	:pc#4105068:oc#0:
-
-QUANTUM LPS540S:\
-	:ty#winchester:ns#125:nt#4:nc#2113:
-
-QUANTUM PD1050iS:\
-	:ty#winchester:ns#92:nt#12:nc#1859:\
-	:pc#2052336:oc#0:
-
-QUANTUM XP34301:\
-	:ty#winchester:ns#118:nt#20:nc#3561:
-
-Quantum ELS 127S:\
-	:ty#winchester:ns#54:nt#3:nc#1541:
-
-Quantum ELS 170S:\
-	:ty#winchester:ns#54:nt#4:nc#1542:
-
-Quantum ELS 85S:\
-	:ty#winchester:ns#54:nt#2:nc#1535:
-
-Quantum Empire 1080S:\
-	:ty#winchester:ns#92:nt#16:nc#1431:
-
-Quantum Empire 540S:\
-	:ty#winchester:ns#92:nt#8:nc#1431:
-
-Quantum GoDrive 120S:\
-	:ty#winchester:ns#56:nt#4:nc#1067:
-
-Quantum GoDrive 160S:\
-	:ty#winchester:ns#58:nt#4:nc#1413:
-
-Quantum LPS 105S:\
-	:ty#winchester:ns#42:nt#4:nc#1221:
-
-Quantum LPS 120S:\
-	:ty#winchester:ns#60:nt#2:nc#1987:
-
-Quantum LPS 240S:\
-	:ty#winchester:ns#60:nt#4:nc#1995:
-
-Quantum LPS 270S:\
-	:ty#winchester:ns#76:nt#7:nc#992:
-
-Quantum LPS 525S:\
-	:ty#winchester:ns#70:nt#6:nc#2444:
-
-Quantum Lightning 730S:\
-	:ty#winchester:ns#63:nt#16:nc#1415:\
-	:pa#161280:oa#0:ba#8192:\
-	:pb#96768:ob#161280:\
-	:pc#1426320:oc#0:\
-	:pg#1168272:og#258048:
-
-Quantum PD 1050S:\
-	:ty#winchester:ns#70:nt#12:nc#2444:
-
-Quantum PD 120S:\
-	:ty#winchester:ns#42:nt#5:nc#1114:
-
-Quantum PD 1225S:\
-	:ty#winchester:ns#70:nt#14:nc#2442:
-
-Quantum PD 170S:\
-	:ty#winchester:ns#42:nt#7:nc#1117:
-
-Quantum PD 210S:\
-	:ty#winchester:ns#49:nt#7:nc#1189:
-
-Quantum PD 425S:\
-	:ty#winchester:ns#60:nt#9:nc#1540:
-
-Quantum PD 700S:\
-	:ty#winchester:ns#70:nt#8:nc#2441:
-
-Quantum ProDrive 80S:\
-	:ty#winchester:ns#34:nt#6:nc#832:
-
-Quantum XP32150:\
-	:ty#winchester:ns#109:nt#10:nc#3850:
-
-RICOH RO-5031E:\
-	:ty#winchester:ns#54:nt#15:nc#710:\
-	:pc#575100:oc#0:
-
-RZ24:\
-	:ty#winchester:ns#38:nt#8:nc#1344:\
-	:pc#409792:oc#0:
-
-RZ55:\
-	:ty#winchester:ns#35:nt#15:nc#1218:\
-	:pa#32025:oa#0:ba#8192:\
-	:pb#59850:ob#32025:\
-	:pc#639450:oc#0:\
-	:pg#547575:og#91875:
-
-SEAGATE ST11950N:\
-	:ty#winchester:ns#81:nt#15:nc#2715:\
-	:pc#3298725:oc#0:
-
-SEAGATE ST15230N:\
-	:ty#winchester:ns#111:nt#19:nc#3974:
-
-SEAGATE ST31200N:\
-	:ty#winchester:ns#85:nt#9:nc#2692:
-
-SEAGATE ST31230N:\
-	:ty#winchester:ns#104:nt#5:nc#3978:\
-	:pc#2068560:oc#0:
-
-SEAGATE ST32550N:\
-	:ty#winchester:ns#109:nt#11:nc#3495:\
-	:pc#4190505:oc#0:
-
-SEAGATE ST3600N:\
-	:ty#winchester:ns#79:nt#7:nc#1853:\
-	:pc#1024709:oc#0:
-
-ST83220K:\
-	:ty#"ISP-80":ns#102:nt#19:nc#2652:
-
-SUN0104:\
-	:ty#winchester:ns#35:nt#6:nc#974:
-
-SUN0121:\
-	:ty#winchester:ns#39:nt#4:nc#1520:
-
-SUN0207:\
-	:ty#winchester:ns#36:nt#9:nc#1254:
-
-SUN0327:\
-	:ty#winchester:ns#46:nt#9:nc#1545:
-
-SUN0424:\
-	:ty#winchester:ns#80:nt#9:nc#1151:
-
-SUN0535:\
-	:ty#winchester:ns#80:nt#7:nc#1866:
-
-SUN0669:\
-	:ty#winchester:ns#54:nt#15:nc#1614:
-
-SUN1.3G:\
-	:ty#winchester:ns#80:nt#17:nc#1965:
-
-SUN2.1G:\
-	:ty#winchester:ns#80:nt#19:nc#2733:
-
-Sabre ST82500J:\
-	:ty#XD7053:ns#82:nt#19:nc#2609:
-
-Seagate (CDC) Wren V 94181-702:\
-	:ty#winchester:ns#48:nt#15:nc#1543:
-
-Seagate (CDC) Wren VI 94191-766:\
-	:ty#winchester:ns#52:nt#15:nc#1659:
-
-Seagate (CDC) Wren VII 94601-1.2G SunOS 4.1.1:\
-	:ty#winchester:ns#70:nt#15:nc#1925:
-
-Seagate (CDC) Wren VII 94601-15:\
-	:ty#winchester:ns#71:nt#15:nc#1905:
-
-Seagate (CDC) Wren VIII ST41650N:\
-	:ty#winchester:ns#89:nt#15:nc#2070:
-
-Seagate Elite ST43400N-3.5G:\
-	:ty#winchester:ns#99:nt#21:nc#2736:\
-	:pa#2843360:oa#0:ba#8192:\
-	:pb#2843360:ob#2841993:
-
-Seagate IPI ZBR Elite:\
-	:ty#"ISP-80":ns#78:nt#17:nc#1893:\
-	:pa#34476:oa#0:ba#8192:\
-	:pb#132600:ob#34476:\
-	:pc#2510118:oc#0:\
-	:pg#663000:og#167076:\
-	:ph#1680042:oh#830076:
-
-Seagate ST11200N:\
-	:ty#winchester:ns#80:nt#15:nc#1714:\
-	:pa#2056800:oa#0:ba#8192:\
-	:pc#2056800:oc#0:
-
-Seagate ST11900N:\
-	:ty#winchester:ns#83:nt#15:nc#2619:\
-	:pb#498000:ob#0:\
-	:pc#3260655:oc#0:\
-	:ph#2761410:oh#498000:
-
-Seagate ST1239N SWIFT:\
-	:ty#winchester:ns#35:nt#9:nc#1264:
-
-Seagate ST12400N 2.4GB:\
-	:ty#winchester:ns#82:nt#19:nc#2668:\
-	:pa#32718:oa#0:ba#8192:\
-	:pb#65436:ob#32718:\
-	:pc#4156744:oc#0:\
-	:pg#4058590:og#98154:
-
-Seagate ST12550N:\
-	:ty#winchester:ns#80:nt#19:nc#2747:
-
-Seagate ST1480N:\
-	:ty#winchester:ns#64:nt#9:nc#1456:
-
-Seagate ST15150N:\
-	:ty#winchester:ns#78:nt#21:nc#5119:\
-	:pc#8384922:oc#0:
-
-Seagate ST410800N Elite 9:\
-	:ty#winchester:ns#108:nt#27:nc#6087:\
-	:pc#17749692:oc#0:
-
-Seagate ST42100N - Wren 9:\
-	:ty#winchester:ns#96:nt#15:nc#2574:\
-	:pc#3706560:oc#0:
-
-Seagate ST42400N Elite 2:\
-	:ty#winchester:ns#84:nt#19:nc#2604:\
-	:pc#4155984:oc#0:
-
-Seagate Sabre-5 ST81236J:\
-	:ty#XD7053:ns#82:nt#15:nc#1633:\
-	:pa#99630:oa#0:ba#8192:\
-	:pb#261990:ob#99630:\
-	:pc#2008590:oc#0:\
-	:pd#548580:od#361620:\
-	:pe#1098390:oe#910200:\
-	:pf#361620:of#0:\
-	:pg#1646970:og#361620:\
-	:ph#1908960:oh#99630:
-
-SeagateST3283N:\
-	:ty#winchester:ns#57:nt#5:nc#1689:
-
-Sun1.0G:\
-	:ty#winchester:ns#80:nt#15:nc#1703:
-
-SyQuest SQ555:\
-	:ty#winchester:ns#34:nt#2:nc#1273:\
-	:pc#86564:oc#0:
-
-Toshiba MK 156F:\
-	:ty#winchester:ns#34:nt#10:nc#815:
-
-Vertex V185:\
-	:ty#ACB4000:ns#17:nt#7:nc#1163:
-