summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--etc/etc.alpha/disktab4
-rw-r--r--etc/etc.amd64/disktab8
-rw-r--r--etc/etc.armish/disktab4
-rw-r--r--etc/etc.armv7/disktab4
-rw-r--r--etc/etc.i386/disktab8
-rw-r--r--etc/etc.macppc/disktab4
-rw-r--r--etc/etc.sparc/disktab12
-rw-r--r--etc/etc.sparc64/disktab11
-rw-r--r--etc/etc.vax/disktab12
-rw-r--r--etc/etc.zaurus/disktab4
-rw-r--r--share/man/man5/disktab.510
11 files changed, 37 insertions, 44 deletions
diff --git a/etc/etc.alpha/disktab b/etc/etc.alpha/disktab
index be9237475e6..e9c865532cb 100644
--- a/etc/etc.alpha/disktab
+++ b/etc/etc.alpha/disktab
@@ -1,7 +1,7 @@
-# $OpenBSD: disktab,v 1.20 2011/04/11 13:09:36 krw Exp $
+# $OpenBSD: disktab,v 1.21 2015/08/13 18:02:56 krw Exp $
floppy|floppy3|3in|3.5in High Density Floppy:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#2880:ob#0:\
:pc#2880:oc#0:
diff --git a/etc/etc.amd64/disktab b/etc/etc.amd64/disktab
index c013ac233f8..8dded422a9f 100644
--- a/etc/etc.amd64/disktab
+++ b/etc/etc.amd64/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.15 2015/07/26 14:07:49 krw Exp $
+# $OpenBSD: disktab,v 1.16 2015/08/13 18:02:57 krw Exp $
mini34|gzip bsd.rd disk image 3.40625MB:\
:ty=SCSI:se#512:nt#1:ns#64:nc#109:\
@@ -11,19 +11,19 @@ install280|install.fs disk image 280MB:\
:pc#573440:oc#0:
floppy576|3in|3.5in High Density Floppy, 5.76MB:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#160:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#36:nc#160:\
:pa#11520:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#11520:ob#0:\
:pc#11520:oc#0:
floppy288|3in|3.5in High Density Floppy, 2.88MB:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#36:nc#80:\
:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#5760:ob#0:\
:pc#5760:oc#0:
floppy|floppy3|3in|3.5in High Density Floppy:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#2880:ob#0:\
:pc#2880:oc#0:
diff --git a/etc/etc.armish/disktab b/etc/etc.armish/disktab
index abc4580e430..eec6172cd6b 100644
--- a/etc/etc.armish/disktab
+++ b/etc/etc.armish/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.2 2010/07/02 20:33:54 tedu Exp $
+# $OpenBSD: disktab,v 1.3 2015/08/13 18:02:57 krw Exp $
# Leave nc=16; adjust size using: ns
rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -19,7 +19,7 @@ miniroot:\
:pa#10240:ba#8192:fa#1024:
floppy|floppy3|3in|3.5in High Density Floppy:\
- :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:\
:pb#2880:ob#0:\
:pc#2880:oc#0:
diff --git a/etc/etc.armv7/disktab b/etc/etc.armv7/disktab
index 025b4bf8089..54bd18b4199 100644
--- a/etc/etc.armv7/disktab
+++ b/etc/etc.armv7/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.2 2015/08/01 00:15:37 jsg Exp $
+# $OpenBSD: disktab,v 1.3 2015/08/13 18:02:57 krw Exp $
# Leave nc=16; adjust size using: ns
rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -19,7 +19,7 @@ miniroot:\
:pa#10240:ba#8192:fa#1024:
floppy|floppy3|3in|3.5in High Density Floppy:\
- :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:\
:pb#2880:ob#0:\
:pc#2880:oc#0:
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index b5cc9435058..d5a6448bf58 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.23 2015/07/27 19:17:10 krw Exp $
+# $OpenBSD: disktab,v 1.24 2015/08/13 18:02:57 krw Exp $
mini34|gzip bsd.rd disk image 3.40625MB:\
:ty=SCSI:se#512:nt#1:ns#64:nc#109:\
@@ -11,19 +11,19 @@ install240|install.fs disk image 240MB:\
:pc#491520:oc#0:
floppy288|3in|3.5in High Density Floppy, 2.88MB:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#36:nc#80:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#36:nc#80:\
:pa#5760:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#5760:ob#0:\
:pc#5760:oc#0:
floppy|floppy3|3in|3.5in High Density Floppy:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#2880:ob#0:\
:pc#2880:oc#0:
floppy5|5in|5.25in High Density Floppy:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#15:nc#80:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#15:nc#80:\
:pa#2400:oa#0:ba#4096:fa#512:ta=4.2BSD: \
:pb#2400:ob#0:bb#4096:fb#512:\
:pc#2400:oc#0:bc#4096:fc#512:
diff --git a/etc/etc.macppc/disktab b/etc/etc.macppc/disktab
index 92289b560e1..8252952d511 100644
--- a/etc/etc.macppc/disktab
+++ b/etc/etc.macppc/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.4 2010/07/02 20:33:54 tedu Exp $
+# $OpenBSD: disktab,v 1.5 2015/08/13 18:02:57 krw Exp $
# Leave nc=16; adjust size using: ns
rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -12,7 +12,7 @@ miniroot:\
:pa#10240:ba#8192:fa#1024:
floppy|floppy3|3in|3.5in High Density Floppy:\
- :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:\
:pb#2880:ob#0:\
:pc#2880:oc#0:
diff --git a/etc/etc.sparc/disktab b/etc/etc.sparc/disktab
index 49c4ced4308..1bbe5b3db2f 100644
--- a/etc/etc.sparc/disktab
+++ b/etc/etc.sparc/disktab
@@ -1,32 +1,32 @@
-# $OpenBSD: disktab,v 1.26 2012/09/10 18:49:42 deraadt Exp $
+# $OpenBSD: disktab,v 1.27 2015/08/13 18:02:57 krw Exp $
miniroot:\
- :ty=winchester:se#512:nt#2:rm#300:ns#64:nc#96:\
+ :ty=winchester:se#512:nt#2:ns#64:nc#96:\
:ts=3500:\
:pa#12288:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
:pb#0:ob#0:\
:pc#12288:oc#0:
rdroot:\
- :ty=ramdisk:se#512:nt#2:rm#300:ns#4:nc#500:\
+ :ty=ramdisk:se#512:nt#2:ns#4:nc#500:\
:pa#4000:oa#0:ta=4.2BSD:ba#8192:fa#1024:\
:pc#4000:oc#0:
floppy|floppy3|3in|3.5in High Density Floppy:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:\
:pb#2880:ob#0:\
:pc#2880:oc#0:
# test if not having an 'a' works?
fakecdrom|Fake image for Bootable CDROM:\
- :ty=winchester:se#512:nt#1:rm#350:ns#640:nc#2048:\
+ :ty=winchester:se#512:nt#1:ns#640:nc#2048:\
:pa#1310720:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
:pb#1310720:ob#0:bb#8192:fb#1024:tb=4.2BSD:\
:pc#1310720:oc#0:bc#8192:fc#1024:tc=4.2BSD:\
:pd#1310720:od#0:bd#8192:fd#1024:td=4.2BSD:
fakeramdisk:\
- :ty=winchester:se#512:nt#1:rm#350:ns#32:nc#384:\
+ :ty=winchester:se#512:nt#1:ns#32:nc#384:\
:pa#12288:oa#0:ba#8192:fa#4096:ta=4.2BSD:\
:pc#12288:oc#0:
diff --git a/etc/etc.sparc64/disktab b/etc/etc.sparc64/disktab
index 91268f233d2..c50f3a74746 100644
--- a/etc/etc.sparc64/disktab
+++ b/etc/etc.sparc64/disktab
@@ -1,8 +1,7 @@
-# $OpenBSD: disktab,v 1.15 2011/06/08 19:16:19 krw Exp $
+# $OpenBSD: disktab,v 1.16 2015/08/13 18:02:57 krw Exp $
miniroot:\
- :ty=winchester:se#512:nt#2:rm#300:ns#64:nc#90:\
- :ts=3500:\
+ :ty=winchester:se#512:nt#2:ns#64:nc#90:\
:pa#11520:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
:pb#0:ob#0:\
:pc#11520:oc#0:
@@ -14,21 +13,21 @@ rdroot|ramdiskroot|RAM-disk root FS image:\
:ob#0:pb#0:oc#0:pc#6144
floppy|floppy3|3in|3.5in High Density Floppy:\
- :dt=floppy:ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :dt=floppy:ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:\
:pb#2880:ob#0:\
:pc#2880:oc#0:
# test if not having an 'a' works?
fakecdrom|Fake image for Bootable CDROM:\
- :ty=winchester:se#512:nt#1:rm#350:ns#640:nc#2048:\
+ :ty=winchester:se#512:nt#1:ns#640:nc#2048:\
:pa#1310720:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
:pb#1310720:ob#0:bb#8192:fb#1024:tb=4.2BSD:\
:pc#1310720:oc#0:bc#8192:fc#1024:tc=4.2BSD:\
:pd#1310720:od#0:bd#8192:fd#1024:td=4.2BSD:
fakeramdisk:\
- :ty=winchester:se#512:nt#1:rm#350:ns#32:nc#180:\
+ :ty=winchester:se#512:nt#1:ns#32:nc#180:\
:pa#5760:oa#0:ba#8192:fa#4096:ta=4.2BSD:\
:pc#5760:oc#0:
diff --git a/etc/etc.vax/disktab b/etc/etc.vax/disktab
index bce09bacc82..d1c7e8741cb 100644
--- a/etc/etc.vax/disktab
+++ b/etc/etc.vax/disktab
@@ -1,30 +1,30 @@
-# $OpenBSD: disktab,v 1.16 2013/07/16 17:31:39 deraadt Exp $
+# $OpenBSD: disktab,v 1.17 2015/08/13 18:02:57 krw Exp $
bootroot|fake-type used in install boot:\
- :ty=fake:se#512:nt#1:rm#10:ns#512:nc#1:\
+ :ty=fake:se#512:nt#1:ns#512:nc#1:\
:pa#512:oa#0:ba#4096:fa#512:\
:pb#512:ob#0:bb#4096:fb#512:\
:pc#512:oc#0:bc#4096:fc#512:
miniroot|fake-type used when installation:\
- :ty=fake:se#512:nt#1:rm#3600:ns#2048:nc#1:\
+ :ty=fake:se#512:nt#1:ns#2048:nc#1:\
:pa#4096:oa#0:ba#4096:fa#512:ta=4.2BSD:ba#4096: \
:pb#4096:ob#0:bb#4096:fb#512:\
:pc#4096:oc#0:bc#4096:fc#512:
rdroot:\
- :ty=ramdisk:se#512:nt#2:rm#300:ns#8:nc#192:\
+ :ty=ramdisk:se#512:nt#2:ns#8:nc#192:\
:pa#3072:oa#0:ta=4.2BSD:ba#4096:fa#1024:\
:pc#3072:oc#0:
floppy|floppy3|3in|3.5in High Density Floppy:\
- :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:ta=4.2BSD:\
:pb#2880:ob#0:\
:pc#2880:oc#0:
isoroot:\
- :ty=fake:se#512:nt#11:ns#33:rm#3600:nc#2200:\
+ :ty=fake:se#512:nt#11:ns#33:nc#2200:\
:pa#798600:oa#0:ba#8192:fa#1024:ta=4.2BSD:\
:pc#798600:oc#0:
diff --git a/etc/etc.zaurus/disktab b/etc/etc.zaurus/disktab
index 00cc17c757e..afed5a6a37d 100644
--- a/etc/etc.zaurus/disktab
+++ b/etc/etc.zaurus/disktab
@@ -1,4 +1,4 @@
-# $OpenBSD: disktab,v 1.3 2010/07/02 20:33:54 tedu Exp $
+# $OpenBSD: disktab,v 1.4 2015/08/13 18:02:57 krw Exp $
# Leave nc=16; adjust size using: ns
rdroot|ramdiskroot|RAM-disk root FS image:\
@@ -19,7 +19,7 @@ miniroot:\
:pa#10240:ba#8192:fa#1024:
floppy|floppy3|3in|3.5in High Density Floppy:\
- :ty=floppy:se#512:nt#2:rm#300:ns#18:nc#80:\
+ :ty=floppy:se#512:nt#2:ns#18:nc#80:\
:pa#2880:oa#0:ba#4096:fa#512:\
:pb#2880:ob#0:\
:pc#2880:oc#0:
diff --git a/share/man/man5/disktab.5 b/share/man/man5/disktab.5
index e04682f4b41..59f34936414 100644
--- a/share/man/man5/disktab.5
+++ b/share/man/man5/disktab.5
@@ -1,4 +1,4 @@
-.\" $OpenBSD: disktab.5,v 1.14 2011/09/03 22:59:07 jmc Exp $
+.\" $OpenBSD: disktab.5,v 1.15 2015/08/13 18:02:56 krw Exp $
.\" $NetBSD: disktab.5,v 1.4 1994/11/30 19:31:15 jtc Exp $
.\"
.\" Copyright (c) 1983, 1991, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)disktab.5 8.1 (Berkeley) 6/5/93
.\"
-.Dd $Mdocdate: September 3 2011 $
+.Dd $Mdocdate: August 13 2015 $
.Dt DISKTAB 5
.Os
.Sh NAME
@@ -71,12 +71,6 @@ The following list indicates the normal values stored for each disk entry:
.It \&se Ta num Ta "Sector size in bytes (default:"
.Dv DEV_BSIZE ) .
.It \&sf Ta bool Ta "Controller supports bad144-style bad sector forwarding."
-.It \&rm Ta num Ta "Rotation speed in RPM (default: 3600)."
-.It \&sk Ta num Ta "Sector skew per track (default: 0)."
-.It \&cs Ta num Ta "Sector skew per cylinder (default: 0)."
-.It \&hs Ta num Ta "Headswitch time in usec (default: 0)."
-.It \&ts Ta num Ta "One-cylinder seek time in usec (default: 0)."
-.It \&il Ta num Ta "Sector interleave (n:1) (default: 1)."
.It \&d[0-4] Ta num Ta "Drive-type-dependent parameters."
.It \&b0 Ta str Ta "Pathname to primary bootstrap."
.It \&b1 Ta str Ta "Pathname to secondary bootstrap."
Copyright © 1996 – 2023 Jason A. Donenfeld. All Rights Reverse Engineered.