From d1febf72315b6d9a5c9b317a8709421bfa3e9d7c Mon Sep 17 00:00:00 2001 From: krw Date: Fri, 10 Dec 2021 13:17:09 +0000 Subject: [PATCH] Update the *.ok files to reflect the slightly larger last partition the latest fdisk allows. Spotted, fix tested and ok anton@ --- regress/sbin/disklabel/1000.ok | 2 +- regress/sbin/disklabel/12000.ok | 2 +- regress/sbin/disklabel/18000.ok | 2 +- regress/sbin/disklabel/2000.ok | 2 +- regress/sbin/disklabel/20000.ok | 2 +- regress/sbin/disklabel/2200.ok | 2 +- regress/sbin/disklabel/2300.ok | 2 +- regress/sbin/disklabel/256.ok | 2 +- regress/sbin/disklabel/3000.ok | 2 +- regress/sbin/disklabel/300000.ok | 2 +- regress/sbin/disklabel/3500.ok | 2 +- regress/sbin/disklabel/400.ok | 2 +- regress/sbin/disklabel/4000.ok | 2 +- regress/sbin/disklabel/40000.ok | 2 +- regress/sbin/disklabel/4100.ok | 2 +- regress/sbin/disklabel/5000.ok | 2 +- regress/sbin/disklabel/6000.ok | 2 +- regress/sbin/disklabel/800.ok | 2 +- regress/sbin/disklabel/90000.ok | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/regress/sbin/disklabel/1000.ok b/regress/sbin/disklabel/1000.ok index 59a2b46cc4f..0e6889ba800 100644 --- a/regress/sbin/disklabel/1000.ok +++ b/regress/sbin/disklabel/1000.ok @@ -4,7 +4,7 @@ Writing MBR at offset 0. a: 1.0G 128 4.2BSD 2048 16384 1 # / a: 2017088 128 4.2BSD 2048 16384 1 b: 0.0G 2017216 swap - b: 32784 2017216 swap + b: 32832 2017216 swap /dev/vnd0a / ffs rw 1 1 /dev/vnd0b none swap sw diff --git a/regress/sbin/disklabel/12000.ok b/regress/sbin/disklabel/12000.ok index a481efd897a..53ee852eeff 100644 --- a/regress/sbin/disklabel/12000.ok +++ b/regress/sbin/disklabel/12000.ok @@ -20,7 +20,7 @@ Writing MBR at offset 0. j: 5.0G 11285472 4.2BSD 2048 16384 1 # /usr/obj j: 10569216 11285472 4.2BSD 2048 16384 1 k: 1.3G 21854688 4.2BSD 2048 16384 1 # /home - k: 2723296 21854688 4.2BSD 2048 16384 1 + k: 2723360 21854688 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/18000.ok b/regress/sbin/disklabel/18000.ok index 9a80be91e1b..5fe298d8468 100644 --- a/regress/sbin/disklabel/18000.ok +++ b/regress/sbin/disklabel/18000.ok @@ -20,7 +20,7 @@ Writing MBR at offset 0. j: 5.3G 19395552 4.2BSD 2048 16384 1 # /usr/obj j: 11060736 19395552 4.2BSD 2048 16384 1 k: 3.1G 30456288 4.2BSD 2048 16384 1 # /home - k: 6409696 30456288 4.2BSD 2048 16384 1 + k: 6409760 30456288 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/2000.ok b/regress/sbin/disklabel/2000.ok index 32df4149d00..93fcda9377f 100644 --- a/regress/sbin/disklabel/2000.ok +++ b/regress/sbin/disklabel/2000.ok @@ -4,7 +4,7 @@ Writing MBR at offset 0. a: 1.9G 128 4.2BSD 2048 16384 1 # / a: 3962688 128 4.2BSD 2048 16384 1 b: 0.1G 3962816 swap - b: 135184 3962816 swap + b: 135232 3962816 swap /dev/vnd0a / ffs rw 1 1 /dev/vnd0b none swap sw diff --git a/regress/sbin/disklabel/20000.ok b/regress/sbin/disklabel/20000.ok index 60c14948bde..2260ab2e3ea 100644 --- a/regress/sbin/disklabel/20000.ok +++ b/regress/sbin/disklabel/20000.ok @@ -20,7 +20,7 @@ Writing MBR at offset 0. j: 5.4G 22098912 4.2BSD 2048 16384 1 # /usr/obj j: 11224576 22098912 4.2BSD 2048 16384 1 k: 3.6G 33323488 4.2BSD 2048 16384 1 # /home - k: 7638496 33323488 4.2BSD 2048 16384 1 + k: 7638560 33323488 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/2200.ok b/regress/sbin/disklabel/2200.ok index be5a0e92cd9..2de0060eaab 100644 --- a/regress/sbin/disklabel/2200.ok +++ b/regress/sbin/disklabel/2200.ok @@ -4,7 +4,7 @@ Writing MBR at offset 0. a: 2.1G 128 4.2BSD 2048 16384 1 # / a: 4351808 128 4.2BSD 2048 16384 1 b: 0.1G 4351936 swap - b: 155664 4351936 swap + b: 155712 4351936 swap /dev/vnd0a / ffs rw 1 1 /dev/vnd0b none swap sw diff --git a/regress/sbin/disklabel/2300.ok b/regress/sbin/disklabel/2300.ok index c9207d00748..524c40d6544 100644 --- a/regress/sbin/disklabel/2300.ok +++ b/regress/sbin/disklabel/2300.ok @@ -4,7 +4,7 @@ Writing MBR at offset 0. a: 2.2G 128 4.2BSD 2048 16384 1 # / a: 4546368 128 4.2BSD 2048 16384 1 b: 0.1G 4546496 swap - b: 165904 4546496 swap + b: 165952 4546496 swap /dev/vnd0a / ffs rw 1 1 /dev/vnd0b none swap sw diff --git a/regress/sbin/disklabel/256.ok b/regress/sbin/disklabel/256.ok index 63ac28c4629..2d0e81a01f8 100644 --- a/regress/sbin/disklabel/256.ok +++ b/regress/sbin/disklabel/256.ok @@ -2,7 +2,7 @@ Writing MBR at offset 0. a: 0.3G 128 4.2BSD 2048 16384 1 # / - a: 526144 128 4.2BSD 2048 16384 1 + a: 526208 128 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 === End 256MB disk === diff --git a/regress/sbin/disklabel/3000.ok b/regress/sbin/disklabel/3000.ok index a1bdea2fa12..30dd17fdac5 100644 --- a/regress/sbin/disklabel/3000.ok +++ b/regress/sbin/disklabel/3000.ok @@ -8,7 +8,7 @@ Writing MBR at offset 0. d: 1.7G 1975904 4.2BSD 2048 16384 1 # /usr d: 3564736 1975904 4.2BSD 2048 16384 1 e: 0.3G 5540640 4.2BSD 2048 16384 1 # /home - e: 605344 5540640 4.2BSD 2048 16384 1 + e: 605408 5540640 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0e /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/300000.ok b/regress/sbin/disklabel/300000.ok index 20f0bd3901e..324e2bbeaba 100644 --- a/regress/sbin/disklabel/300000.ok +++ b/regress/sbin/disklabel/300000.ok @@ -20,7 +20,7 @@ Writing MBR at offset 0. j: 6.0G 181011712 4.2BSD 2048 16384 1 # /usr/obj j: 12582912 181011712 4.2BSD 2048 16384 1 k: 200.7G 193594624 4.2BSD 4096 32768 1 # /home - k: 420807360 193594624 4.2BSD 4096 32768 1 + k: 420807424 193594624 4.2BSD 4096 32768 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/3500.ok b/regress/sbin/disklabel/3500.ok index 9383ddd4304..2bda4cace03 100644 --- a/regress/sbin/disklabel/3500.ok +++ b/regress/sbin/disklabel/3500.ok @@ -8,7 +8,7 @@ Writing MBR at offset 0. d: 2.1G 2129504 4.2BSD 2048 16384 1 # /usr d: 4363456 2129504 4.2BSD 2048 16384 1 e: 0.3G 6492960 4.2BSD 2048 16384 1 # /home - e: 677024 6492960 4.2BSD 2048 16384 1 + e: 677088 6492960 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0e /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/400.ok b/regress/sbin/disklabel/400.ok index 5eb26d6ae1b..e57b525429e 100644 --- a/regress/sbin/disklabel/400.ok +++ b/regress/sbin/disklabel/400.ok @@ -2,7 +2,7 @@ Writing MBR at offset 0. a: 0.4G 128 4.2BSD 2048 16384 1 # / - a: 821056 128 4.2BSD 2048 16384 1 + a: 821120 128 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 === End 400MB disk === diff --git a/regress/sbin/disklabel/4000.ok b/regress/sbin/disklabel/4000.ok index 44bd46f8bac..ecb7d7af250 100644 --- a/regress/sbin/disklabel/4000.ok +++ b/regress/sbin/disklabel/4000.ok @@ -8,7 +8,7 @@ Writing MBR at offset 0. d: 2.5G 2283104 4.2BSD 2048 16384 1 # /usr d: 5162176 2283104 4.2BSD 2048 16384 1 e: 0.4G 7445280 4.2BSD 2048 16384 1 # /home - e: 748704 7445280 4.2BSD 2048 16384 1 + e: 748768 7445280 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0e /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/40000.ok b/regress/sbin/disklabel/40000.ok index dcb3dfd5a8a..cd21962f5f6 100644 --- a/regress/sbin/disklabel/40000.ok +++ b/regress/sbin/disklabel/40000.ok @@ -20,7 +20,7 @@ Writing MBR at offset 0. j: 6.0G 47478752 4.2BSD 2048 16384 1 # /usr/obj j: 12582912 47478752 4.2BSD 2048 16384 1 k: 10.4G 60061664 4.2BSD 2048 16384 1 # /home - k: 21860320 60061664 4.2BSD 2048 16384 1 + k: 21860384 60061664 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/4100.ok b/regress/sbin/disklabel/4100.ok index c347ab90248..6fcd63923ed 100644 --- a/regress/sbin/disklabel/4100.ok +++ b/regress/sbin/disklabel/4100.ok @@ -8,7 +8,7 @@ Writing MBR at offset 0. d: 2.5G 2313824 4.2BSD 2048 16384 1 # /usr d: 5321920 2313824 4.2BSD 2048 16384 1 e: 0.4G 7635744 4.2BSD 2048 16384 1 # /home - e: 763040 7635744 4.2BSD 2048 16384 1 + e: 763104 7635744 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0e /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/5000.ok b/regress/sbin/disklabel/5000.ok index 034880cbbf5..3abdef252e0 100644 --- a/regress/sbin/disklabel/5000.ok +++ b/regress/sbin/disklabel/5000.ok @@ -8,7 +8,7 @@ Writing MBR at offset 0. d: 3.0G 2425440 4.2BSD 2048 16384 1 # /usr d: 6291456 2425440 4.2BSD 2048 16384 1 e: 0.7G 8716896 4.2BSD 2048 16384 1 # /home - e: 1525088 8716896 4.2BSD 2048 16384 1 + e: 1525152 8716896 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0e /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/6000.ok b/regress/sbin/disklabel/6000.ok index ac019423886..944db80e8c4 100644 --- a/regress/sbin/disklabel/6000.ok +++ b/regress/sbin/disklabel/6000.ok @@ -8,7 +8,7 @@ Writing MBR at offset 0. d: 3.0G 2527840 4.2BSD 2048 16384 1 # /usr d: 6291456 2527840 4.2BSD 2048 16384 1 e: 1.7G 8819296 4.2BSD 2048 16384 1 # /home - e: 3470688 8819296 4.2BSD 2048 16384 1 + e: 3470752 8819296 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0e /home ffs rw 1 2 diff --git a/regress/sbin/disklabel/800.ok b/regress/sbin/disklabel/800.ok index ec1cef3236d..3d3c22f113c 100644 --- a/regress/sbin/disklabel/800.ok +++ b/regress/sbin/disklabel/800.ok @@ -4,7 +4,7 @@ Writing MBR at offset 0. a: 0.8G 128 4.2BSD 2048 16384 1 # / a: 1627968 128 4.2BSD 2048 16384 1 b: 0.0G 1628096 swap - b: 12304 1628096 swap + b: 12352 1628096 swap /dev/vnd0a / ffs rw 1 1 /dev/vnd0b none swap sw diff --git a/regress/sbin/disklabel/90000.ok b/regress/sbin/disklabel/90000.ok index 9abaf7faf50..d263eae78de 100644 --- a/regress/sbin/disklabel/90000.ok +++ b/regress/sbin/disklabel/90000.ok @@ -20,7 +20,7 @@ Writing MBR at offset 0. j: 6.0G 95377856 4.2BSD 2048 16384 1 # /usr/obj j: 12582912 95377856 4.2BSD 2048 16384 1 k: 36.4G 107960768 4.2BSD 2048 16384 1 # /home - k: 76361216 107960768 4.2BSD 2048 16384 1 + k: 76361280 107960768 4.2BSD 2048 16384 1 /dev/vnd0a / ffs rw 1 1 /dev/vnd0k /home ffs rw 1 2 -- 2.20.1