From 8e30ef80ae3b3c5c4f702e2b7b5a679af00decfc Mon Sep 17 00:00:00 2001 From: krw Date: Mon, 6 Mar 2023 18:12:47 +0000 Subject: [PATCH] Remove pointless ":ob#0:pb#0:[tb=swap:]" disktab lines. ok miod@ --- etc/etc.amd64/disktab | 4 +--- etc/etc.arm64/disktab | 4 ++-- etc/etc.armv7/disktab | 4 ++-- etc/etc.hppa/disktab | 4 ++-- etc/etc.i386/disktab | 4 +--- etc/etc.landisk/disktab | 6 ++---- etc/etc.loongson/disktab | 4 ++-- etc/etc.luna88k/disktab | 6 +++--- etc/etc.macppc/disktab | 4 ++-- etc/etc.octeon/disktab | 8 ++++---- etc/etc.powerpc64/disktab | 6 +++--- etc/etc.riscv64/disktab | 4 ++-- etc/etc.sparc64/disktab | 5 ++--- 13 files changed, 28 insertions(+), 35 deletions(-) diff --git a/etc/etc.amd64/disktab b/etc/etc.amd64/disktab index 36f6bacf371..b536fbb46aa 100644 --- a/etc/etc.amd64/disktab +++ b/etc/etc.amd64/disktab @@ -1,4 +1,4 @@ -# $OpenBSD: disktab,v 1.28 2021/11/07 15:50:15 deraadt Exp $ +# $OpenBSD: disktab,v 1.29 2023/03/06 18:12:47 krw Exp $ mini34|gzip bsd.rd disk image 4.4.6875MB:\ :dt=rdroot:se#512:nt#1:ns#64:nc#160:\ @@ -36,11 +36,9 @@ floppy|floppy3|3in|3.5in High Density Floppy:\ rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nt#2:ns#140:nc#16:\ :pa#4480:oa#0:ta=4.2BSD:ba#4096:fa#512:\ - :pb#0:ob#0:tb=swap:\ :pc#4480:oc#0: rdrootb|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nt#2:ns#230:nc#16:\ :pa#7360:oa#0:ta=4.2BSD:ba#4096:fa#512:\ - :pb#0:ob#0:tb=swap:\ :pc#7360:oc#0: diff --git a/etc/etc.arm64/disktab b/etc/etc.arm64/disktab index 87ee80c8281..89c3768634f 100644 --- a/etc/etc.arm64/disktab +++ b/etc/etc.arm64/disktab @@ -1,10 +1,10 @@ -# $OpenBSD: disktab,v 1.4 2021/04/17 21:19:40 sthen Exp $ +# $OpenBSD: disktab,v 1.5 2023/03/06 18:12:47 krw Exp $ # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#768:\ :ta=4.2BSD:oa#0:pa#24576:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#24576: + :oc#0:pc#24576: miniroot:\ :dt=rdroot:se#512:nc#33:nt#16:ns#128:\ diff --git a/etc/etc.armv7/disktab b/etc/etc.armv7/disktab index 5bb1ea5658e..24a80740a5f 100644 --- a/etc/etc.armv7/disktab +++ b/etc/etc.armv7/disktab @@ -1,10 +1,10 @@ -# $OpenBSD: disktab,v 1.14 2022/02/09 07:28:54 visa Exp $ +# $OpenBSD: disktab,v 1.15 2023/03/06 18:12:47 krw Exp $ # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#700:\ :ta=4.2BSD:oa#0:pa#22400:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#22400: + :oc#0:pc#22400: miniroot:\ :dt=rdroot:se#512:nc#9:nt#16:ns#496:\ diff --git a/etc/etc.hppa/disktab b/etc/etc.hppa/disktab index c52304d7fcf..c443b99b027 100644 --- a/etc/etc.hppa/disktab +++ b/etc/etc.hppa/disktab @@ -1,6 +1,6 @@ -# $OpenBSD: disktab,v 1.11 2018/09/20 15:19:38 deraadt Exp $ +# $OpenBSD: disktab,v 1.12 2023/03/06 18:12:47 krw Exp $ rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#18:nt#2:ns#220:\ :ta=4.2BSD:oa#0:pa#7920:fa#1024:ba#8192:\ - :ob#0:pb#0:oc#0:pc#7920: + :oc#0:pc#7920: diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab index f131f4ca981..e3d52890c80 100644 --- a/etc/etc.i386/disktab +++ b/etc/etc.i386/disktab @@ -1,4 +1,4 @@ -# $OpenBSD: disktab,v 1.32 2022/03/26 14:26:44 deraadt Exp $ +# $OpenBSD: disktab,v 1.33 2023/03/06 18:12:48 krw Exp $ mini34|gzip bsd.rd disk image 4.34375MB:\ :dt=rdroot:se#512:nt#1:ns#64:nc#132:\ @@ -36,11 +36,9 @@ floppy5|5in|5.25in High Density Floppy:\ rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nt#2:ns#121:nc#16:\ :pa#3872:oa#0:ta=4.2BSD:ba#4096:fa#512:\ - :pb#0:ob#0:tb=swap:\ :pc#3872:oc#0: rdrootb|ramdiskrootb|RAM-disk root FS image:\ :dt=rdroot:se#512:nt#2:ns#200:nc#16:\ :pa#6400:oa#0:ta=4.2BSD:ba#4096:fa#512:\ - :pb#0:ob#0:tb=swap:\ :pc#6400:oc#0: diff --git a/etc/etc.landisk/disktab b/etc/etc.landisk/disktab index a748cab2112..5ddc69d43af 100644 --- a/etc/etc.landisk/disktab +++ b/etc/etc.landisk/disktab @@ -1,20 +1,18 @@ -# $OpenBSD: disktab,v 1.4 2015/08/14 23:45:55 krw Exp $ +# $OpenBSD: disktab,v 1.5 2023/03/06 18:12:48 krw Exp $ # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#256:\ :ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#8192: + :oc#0:pc#8192: rdroot2.5M|ramdiskroot2.5M|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#160:\ :oa#0:pa#5120:ta=4.2BSD:fa#512:ba#4096:\ - :ob#0:pb#0:tb=swap:\ :oc#0:pc#5120: mroot2.5M|miniroot2.5M|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#160:nt#2:ns#16:\ :oa#16:pa#5104:ta=4.2BSD:fa#512:ba#4096:\ - :ob#0:pb#0:tb=swap:\ :oc#0:pc#5120: diff --git a/etc/etc.loongson/disktab b/etc/etc.loongson/disktab index 51c4770f83a..9d85bd7a2d9 100644 --- a/etc/etc.loongson/disktab +++ b/etc/etc.loongson/disktab @@ -1,10 +1,10 @@ -# $OpenBSD: disktab,v 1.4 2015/08/14 23:45:56 krw Exp $ +# $OpenBSD: disktab,v 1.5 2023/03/06 18:12:48 krw Exp $ # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#256:\ :ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#8192: + :oc#0:pc#8192: miniroot|Installation root FS image:\ :dt=rdroot:se#512:nc#9:nt#16:ns#128:\ diff --git a/etc/etc.luna88k/disktab b/etc/etc.luna88k/disktab index e4d8edd9b34..dbcf9c992aa 100644 --- a/etc/etc.luna88k/disktab +++ b/etc/etc.luna88k/disktab @@ -1,13 +1,13 @@ -# $OpenBSD: disktab,v 1.5 2015/08/18 15:37:48 krw Exp $ +# $OpenBSD: disktab,v 1.6 2023/03/06 18:12:48 krw Exp $ # XXX - Would like :ba#4096:fa#512: but that panics... # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#128:\ :ta=4.2BSD:oa#0:pa#4096:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#4096: + :oc#0:pc#4096: miniroot|Installation root-on-swap FS image:\ :dt=rdroot:se#512:ns#32:nt#8:nc#32:\ :ta=4.2BSD:oa#0:pa#8192:\ - :ob#0:pb#0:oc#0:pc#8192: + :oc#0:pc#8192: diff --git a/etc/etc.macppc/disktab b/etc/etc.macppc/disktab index ea6c926a5ac..b5cd62f544f 100644 --- a/etc/etc.macppc/disktab +++ b/etc/etc.macppc/disktab @@ -1,10 +1,10 @@ -# $OpenBSD: disktab,v 1.6 2015/08/14 23:45:56 krw Exp $ +# $OpenBSD: disktab,v 1.7 2023/03/06 18:12:48 krw Exp $ # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#256:\ :ta=4.2BSD:oa#0:pa#8192:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#8192: + :oc#0:pc#8192: # pseudo-geometry taken from rd7945 miniroot:\ diff --git a/etc/etc.octeon/disktab b/etc/etc.octeon/disktab index 260294718e9..3722403f617 100644 --- a/etc/etc.octeon/disktab +++ b/etc/etc.octeon/disktab @@ -1,14 +1,14 @@ -# $OpenBSD: disktab,v 1.4 2019/07/28 15:41:52 visa Exp $ +# $OpenBSD: disktab,v 1.5 2023/03/06 18:12:48 krw Exp $ rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#20:nt#4:ns#128:\ :ta=4.2BSD:oa#0:pa#10240:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#10240: + :oc#0:pc#10240: rdboot|Bootloader image:\ :dt=rdroot:se#512:nc#1:nt#16:ns#128:\ :ta=4.2BSD:oa#0:pa#2048:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#2048: + :oc#0:pc#2048: miniroot|Installation root FS image:\ :dt=rdroot:se#512:nc#9:nt#16:ns#128:\ @@ -17,4 +17,4 @@ miniroot|Installation root FS image:\ minicdroot|minicdramdiskroot|Boot CD-ROM image:\ :dt=rdroot:se#512:nc#48:nt#4:ns#128:\ :ta=4.2BSD:oa#0:pa#24576:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#24576: + :oc#0:pc#24576: diff --git a/etc/etc.powerpc64/disktab b/etc/etc.powerpc64/disktab index aeccfad7830..26d230a7bf2 100644 --- a/etc/etc.powerpc64/disktab +++ b/etc/etc.powerpc64/disktab @@ -1,15 +1,15 @@ -# $OpenBSD: disktab,v 1.2 2020/07/16 19:42:18 kettenis Exp $ +# $OpenBSD: disktab,v 1.3 2023/03/06 18:12:48 krw Exp $ # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#512:\ :ta=4.2BSD:oa#0:pa#16384:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#16384: + :oc#0:pc#16384: rdboot|Bootloader image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#512:\ :ta=4.2BSD:oa#0:pa#16384:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#16384: + :oc#0:pc#16384: miniroot:\ :dt=rdroot:se#512:nc#33:nt#16:ns#128:\ diff --git a/etc/etc.riscv64/disktab b/etc/etc.riscv64/disktab index 66928108a9d..f3487560268 100644 --- a/etc/etc.riscv64/disktab +++ b/etc/etc.riscv64/disktab @@ -1,10 +1,10 @@ -# $OpenBSD: disktab,v 1.1 2021/04/28 03:26:25 drahn Exp $ +# $OpenBSD: disktab,v 1.2 2023/03/06 18:12:48 krw Exp $ # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#512:\ :ta=4.2BSD:oa#0:pa#16384:fa#512:ba#4096:\ - :ob#0:pb#0:oc#0:pc#16384: + :oc#0:pc#16384: miniroot:\ :dt=rdroot:se#512:nc#33:nt#16:ns#128:\ diff --git a/etc/etc.sparc64/disktab b/etc/etc.sparc64/disktab index 3bebb1c2bbd..e79011fcece 100644 --- a/etc/etc.sparc64/disktab +++ b/etc/etc.sparc64/disktab @@ -1,16 +1,15 @@ -# $OpenBSD: disktab,v 1.20 2021/04/11 17:18:15 deraadt Exp $ +# $OpenBSD: disktab,v 1.21 2023/03/06 18:12:48 krw Exp $ miniroot:\ :dt=rdroot:se#512:nt#2:ns#64:nc#90:\ :pa#11520:oa#0:ba#8192:fa#1024:ta=4.2BSD:\ - :pb#0:ob#0:\ :pc#11520:oc#0: # Leave nc=16; adjust size using: ns rdroot|ramdiskroot|RAM-disk root FS image:\ :dt=rdroot:se#512:nc#16:nt#2:ns#192:\ :ta=4.2BSD:oa#0:pa#6144:fa#1024:ba#8192:\ - :ob#0:pb#0:oc#0:pc#6144 + :oc#0:pc#6144 floppy|floppy3|3in|3.5in High Density Floppy:\ :dt=floppy:se#512:nt#2:ns#18:nc#80:\ -- 2.20.1