On Tue, Dec 07, 2021 at 07:58:32AM -0700, Kenneth R Westerback wrote:
> CVSROOT: /cvs
> Module name: src
> Changes by: [email protected] 2021/12/07 07:58:32
>
> Modified files:
> sbin/fdisk : mbr.c
>
> Log message:
> Don't truncate the default OpenBSD partition at the end of the
> last full cylinder. Let it extend to the end of the disk.
This broke regress/sbin/disklabel:
+ . /usr/local/libexec/robsd/util.sh
+ . /usr/local/libexec/robsd/util-ports.sh
+ . /usr/local/libexec/robsd/util-regress.sh
+ regress_root sbin/disklabel
+ unpriv anton exec make -C /home/src/regress/sbin/disklabel
sed '/^getphysmem/,/^}/s/^[ ].*/ physmem = 16844521472ULL;/'
/home/src/regress/sbin/disklabel/../../../sbin/disklabel/disklabel.c
>disklabel.c.tmp
mv disklabel.c.tmp disklabel.c
cc -O2 -pipe -MD -MP -I
/home/src/regress/sbin/disklabel/../../../sbin/disklabel -c disklabel.c
cc -O2 -pipe -MD -MP -I
/home/src/regress/sbin/disklabel/../../../sbin/disklabel -c
/home/src/regress/sbin/disklabel/../../../sbin/disklabel/dkcksum.c
cc -O2 -pipe -MD -MP -I
/home/src/regress/sbin/disklabel/../../../sbin/disklabel -c
/home/src/regress/sbin/disklabel/../../../sbin/disklabel/editor.c
/home/src/regress/sbin/disklabel/../../../sbin/disklabel/editor.c:2421:12:
warning: implicit conversion from 'unsigned long long' to 'double' changes
value from 18446744073709551615 to 18446744073709551616
[-Wimplicit-const-int-float-conversion]
if (val > ULLONG_MAX)
~ ^~~~~~~~~~
/usr/include/sys/limits.h:74:21: note: expanded from macro 'ULLONG_MAX'
# define ULLONG_MAX 0xffffffffffffffffULL
^~~~~~~~~~~~~~~~~~~~~
/home/src/regress/sbin/disklabel/../../../sbin/disklabel/editor.c:2432:44:
warning: implicit conversion from 'unsigned long long' to 'double' changes
value from 18446744073709551615 to 18446744073709551616
[-Wimplicit-const-int-float-conversion]
if (errno == ERANGE || *val < 0 || *val > ULLONG_MAX)
~ ^~~~~~~~~~
/usr/include/sys/limits.h:74:21: note: expanded from macro 'ULLONG_MAX'
# define ULLONG_MAX 0xffffffffffffffffULL
^~~~~~~~~~~~~~~~~~~~~
2 warnings generated.
(echo 'const unsigned char manpage[] = {'; echo 'no manual' | gzip -9c |
hexdump -ve '"0x" 1/1 "%02x,"'; echo '};'; echo 'const int manpage_sz =
sizeof(manpage);') > manual.c
cc -O2 -pipe -MD -MP -I
/home/src/regress/sbin/disklabel/../../../sbin/disklabel -c manual.c
cc -o disklabel disklabel.o dkcksum.o editor.o manual.o -lutil
==== run-disklabel-18000 ====
rm -f 18000.tmp 18000.out
doas -n vnconfig -u vnd0 || true
vnconfig: VNDIOCCLR: Device not configured
rm -f diskimage
echo "=== Start 18000MB disk ===" >18000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=18000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>18000.tmp
echo >>18000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >18000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 18000.fstab vnd0
>>18000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>18000.dl
grep '^ [a-p]: ' 18000.dl | egrep -v "unused" | sort >>18000.tmp
echo >>18000.tmp
cat 18000.fstab >>18000.tmp
echo "=== End 18000MB disk ===" >>18000.tmp
mv 18000.tmp 18000.out
diff -up /home/src/regress/sbin/disklabel/18000.ok 18000.out
--- /home/src/regress/sbin/disklabel/18000.ok Tue Nov 9 17:54:06 2021
+++ 18000.out Fri Dec 10 08:25:56 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-18000')
FAILED
==== run-disklabel-256 ====
rm -f 256.tmp 256.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 256MB disk ===" >256.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=256 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>256.tmp
echo >>256.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >256.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 256.fstab vnd0
>>256.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>256.dl
grep '^ [a-p]: ' 256.dl | egrep -v "unused" | sort >>256.tmp
echo >>256.tmp
cat 256.fstab >>256.tmp
echo "=== End 256MB disk ===" >>256.tmp
mv 256.tmp 256.out
diff -up /home/src/regress/sbin/disklabel/256.ok 256.out
--- /home/src/regress/sbin/disklabel/256.ok Thu Dec 17 21:58:17 2020
+++ 256.out Fri Dec 10 08:25:56 2021
@@ -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 ===
*** Error 1 in . (Makefile:72 'run-disklabel-256')
FAILED
==== run-disklabel-400 ====
rm -f 400.tmp 400.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 400MB disk ===" >400.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=400 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>400.tmp
echo >>400.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >400.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 400.fstab vnd0
>>400.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>400.dl
grep '^ [a-p]: ' 400.dl | egrep -v "unused" | sort >>400.tmp
echo >>400.tmp
cat 400.fstab >>400.tmp
echo "=== End 400MB disk ===" >>400.tmp
mv 400.tmp 400.out
diff -up /home/src/regress/sbin/disklabel/400.ok 400.out
--- /home/src/regress/sbin/disklabel/400.ok Thu Dec 17 21:58:17 2020
+++ 400.out Fri Dec 10 08:25:56 2021
@@ -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 ===
*** Error 1 in . (Makefile:72 'run-disklabel-400')
FAILED
==== run-disklabel-800 ====
rm -f 800.tmp 800.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 800MB disk ===" >800.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=800 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>800.tmp
echo >>800.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >800.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 800.fstab vnd0
>>800.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>800.dl
grep '^ [a-p]: ' 800.dl | egrep -v "unused" | sort >>800.tmp
echo >>800.tmp
cat 800.fstab >>800.tmp
echo "=== End 800MB disk ===" >>800.tmp
mv 800.tmp 800.out
diff -up /home/src/regress/sbin/disklabel/800.ok 800.out
--- /home/src/regress/sbin/disklabel/800.ok Thu Dec 17 21:58:17 2020
+++ 800.out Fri Dec 10 08:25:56 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-800')
FAILED
==== run-disklabel-1000 ====
rm -f 1000.tmp 1000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 1000MB disk ===" >1000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=1000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>1000.tmp
echo >>1000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >1000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 1000.fstab vnd0
>>1000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>1000.dl
grep '^ [a-p]: ' 1000.dl | egrep -v "unused" | sort >>1000.tmp
echo >>1000.tmp
cat 1000.fstab >>1000.tmp
echo "=== End 1000MB disk ===" >>1000.tmp
mv 1000.tmp 1000.out
diff -up /home/src/regress/sbin/disklabel/1000.ok 1000.out
--- /home/src/regress/sbin/disklabel/1000.ok Thu Dec 17 21:58:17 2020
+++ 1000.out Fri Dec 10 08:25:56 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-1000')
FAILED
==== run-disklabel-2000 ====
rm -f 2000.tmp 2000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 2000MB disk ===" >2000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=2000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>2000.tmp
echo >>2000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >2000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 2000.fstab vnd0
>>2000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>2000.dl
grep '^ [a-p]: ' 2000.dl | egrep -v "unused" | sort >>2000.tmp
echo >>2000.tmp
cat 2000.fstab >>2000.tmp
echo "=== End 2000MB disk ===" >>2000.tmp
mv 2000.tmp 2000.out
diff -up /home/src/regress/sbin/disklabel/2000.ok 2000.out
--- /home/src/regress/sbin/disklabel/2000.ok Thu Dec 17 21:58:17 2020
+++ 2000.out Fri Dec 10 08:25:57 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-2000')
FAILED
==== run-disklabel-2200 ====
rm -f 2200.tmp 2200.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 2200MB disk ===" >2200.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=2200 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>2200.tmp
echo >>2200.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >2200.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 2200.fstab vnd0
>>2200.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>2200.dl
grep '^ [a-p]: ' 2200.dl | egrep -v "unused" | sort >>2200.tmp
echo >>2200.tmp
cat 2200.fstab >>2200.tmp
echo "=== End 2200MB disk ===" >>2200.tmp
mv 2200.tmp 2200.out
diff -up /home/src/regress/sbin/disklabel/2200.ok 2200.out
--- /home/src/regress/sbin/disklabel/2200.ok Thu Dec 17 21:58:17 2020
+++ 2200.out Fri Dec 10 08:25:57 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-2200')
FAILED
==== run-disklabel-2300 ====
rm -f 2300.tmp 2300.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 2300MB disk ===" >2300.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=2300 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>2300.tmp
echo >>2300.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >2300.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 2300.fstab vnd0
>>2300.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>2300.dl
grep '^ [a-p]: ' 2300.dl | egrep -v "unused" | sort >>2300.tmp
echo >>2300.tmp
cat 2300.fstab >>2300.tmp
echo "=== End 2300MB disk ===" >>2300.tmp
mv 2300.tmp 2300.out
diff -up /home/src/regress/sbin/disklabel/2300.ok 2300.out
--- /home/src/regress/sbin/disklabel/2300.ok Thu Dec 17 21:58:17 2020
+++ 2300.out Fri Dec 10 08:25:57 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-2300')
FAILED
==== run-disklabel-3000 ====
rm -f 3000.tmp 3000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 3000MB disk ===" >3000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=3000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>3000.tmp
echo >>3000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >3000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 3000.fstab vnd0
>>3000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>3000.dl
grep '^ [a-p]: ' 3000.dl | egrep -v "unused" | sort >>3000.tmp
echo >>3000.tmp
cat 3000.fstab >>3000.tmp
echo "=== End 3000MB disk ===" >>3000.tmp
mv 3000.tmp 3000.out
diff -up /home/src/regress/sbin/disklabel/3000.ok 3000.out
--- /home/src/regress/sbin/disklabel/3000.ok Thu Dec 17 21:58:17 2020
+++ 3000.out Fri Dec 10 08:25:57 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-3000')
FAILED
==== run-disklabel-3500 ====
rm -f 3500.tmp 3500.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 3500MB disk ===" >3500.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=3500 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>3500.tmp
echo >>3500.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >3500.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 3500.fstab vnd0
>>3500.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>3500.dl
grep '^ [a-p]: ' 3500.dl | egrep -v "unused" | sort >>3500.tmp
echo >>3500.tmp
cat 3500.fstab >>3500.tmp
echo "=== End 3500MB disk ===" >>3500.tmp
mv 3500.tmp 3500.out
diff -up /home/src/regress/sbin/disklabel/3500.ok 3500.out
--- /home/src/regress/sbin/disklabel/3500.ok Thu Dec 17 21:58:17 2020
+++ 3500.out Fri Dec 10 08:25:57 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-3500')
FAILED
==== run-disklabel-4000 ====
rm -f 4000.tmp 4000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 4000MB disk ===" >4000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=4000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>4000.tmp
echo >>4000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >4000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 4000.fstab vnd0
>>4000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>4000.dl
grep '^ [a-p]: ' 4000.dl | egrep -v "unused" | sort >>4000.tmp
echo >>4000.tmp
cat 4000.fstab >>4000.tmp
echo "=== End 4000MB disk ===" >>4000.tmp
mv 4000.tmp 4000.out
diff -up /home/src/regress/sbin/disklabel/4000.ok 4000.out
--- /home/src/regress/sbin/disklabel/4000.ok Thu Dec 17 21:58:17 2020
+++ 4000.out Fri Dec 10 08:25:58 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-4000')
FAILED
==== run-disklabel-4100 ====
rm -f 4100.tmp 4100.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 4100MB disk ===" >4100.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=4100 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>4100.tmp
echo >>4100.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >4100.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 4100.fstab vnd0
>>4100.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>4100.dl
grep '^ [a-p]: ' 4100.dl | egrep -v "unused" | sort >>4100.tmp
echo >>4100.tmp
cat 4100.fstab >>4100.tmp
echo "=== End 4100MB disk ===" >>4100.tmp
mv 4100.tmp 4100.out
diff -up /home/src/regress/sbin/disklabel/4100.ok 4100.out
--- /home/src/regress/sbin/disklabel/4100.ok Thu Dec 17 21:58:17 2020
+++ 4100.out Fri Dec 10 08:25:58 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-4100')
FAILED
==== run-disklabel-5000 ====
rm -f 5000.tmp 5000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 5000MB disk ===" >5000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=5000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>5000.tmp
echo >>5000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >5000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 5000.fstab vnd0
>>5000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>5000.dl
grep '^ [a-p]: ' 5000.dl | egrep -v "unused" | sort >>5000.tmp
echo >>5000.tmp
cat 5000.fstab >>5000.tmp
echo "=== End 5000MB disk ===" >>5000.tmp
mv 5000.tmp 5000.out
diff -up /home/src/regress/sbin/disklabel/5000.ok 5000.out
--- /home/src/regress/sbin/disklabel/5000.ok Thu Dec 17 21:58:17 2020
+++ 5000.out Fri Dec 10 08:25:58 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-5000')
FAILED
==== run-disklabel-6000 ====
rm -f 6000.tmp 6000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 6000MB disk ===" >6000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=6000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>6000.tmp
echo >>6000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >6000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 6000.fstab vnd0
>>6000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>6000.dl
grep '^ [a-p]: ' 6000.dl | egrep -v "unused" | sort >>6000.tmp
echo >>6000.tmp
cat 6000.fstab >>6000.tmp
echo "=== End 6000MB disk ===" >>6000.tmp
mv 6000.tmp 6000.out
diff -up /home/src/regress/sbin/disklabel/6000.ok 6000.out
--- /home/src/regress/sbin/disklabel/6000.ok Thu Dec 17 21:58:17 2020
+++ 6000.out Fri Dec 10 08:25:58 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-6000')
FAILED
==== run-disklabel-90000 ====
rm -f 90000.tmp 90000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 90000MB disk ===" >90000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=90000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>90000.tmp
echo >>90000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >90000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 90000.fstab vnd0
>>90000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>90000.dl
grep '^ [a-p]: ' 90000.dl | egrep -v "unused" | sort >>90000.tmp
echo >>90000.tmp
cat 90000.fstab >>90000.tmp
echo "=== End 90000MB disk ===" >>90000.tmp
mv 90000.tmp 90000.out
diff -up /home/src/regress/sbin/disklabel/90000.ok 90000.out
--- /home/src/regress/sbin/disklabel/90000.ok Tue Nov 9 17:54:06 2021
+++ 90000.out Fri Dec 10 08:25:59 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-90000')
FAILED
==== run-disklabel-12000 ====
rm -f 12000.tmp 12000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 12000MB disk ===" >12000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=12000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>12000.tmp
echo >>12000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >12000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 12000.fstab vnd0
>>12000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>12000.dl
grep '^ [a-p]: ' 12000.dl | egrep -v "unused" | sort >>12000.tmp
echo >>12000.tmp
cat 12000.fstab >>12000.tmp
echo "=== End 12000MB disk ===" >>12000.tmp
mv 12000.tmp 12000.out
diff -up /home/src/regress/sbin/disklabel/12000.ok 12000.out
--- /home/src/regress/sbin/disklabel/12000.ok Tue Nov 9 17:54:06 2021
+++ 12000.out Fri Dec 10 08:25:59 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-12000')
FAILED
==== run-disklabel-20000 ====
rm -f 20000.tmp 20000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 20000MB disk ===" >20000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=20000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>20000.tmp
echo >>20000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >20000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 20000.fstab vnd0
>>20000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>20000.dl
grep '^ [a-p]: ' 20000.dl | egrep -v "unused" | sort >>20000.tmp
echo >>20000.tmp
cat 20000.fstab >>20000.tmp
echo "=== End 20000MB disk ===" >>20000.tmp
mv 20000.tmp 20000.out
diff -up /home/src/regress/sbin/disklabel/20000.ok 20000.out
--- /home/src/regress/sbin/disklabel/20000.ok Tue Nov 9 17:54:06 2021
+++ 20000.out Fri Dec 10 08:25:59 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-20000')
FAILED
==== run-disklabel-40000 ====
rm -f 40000.tmp 40000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 40000MB disk ===" >40000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=40000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>40000.tmp
echo >>40000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >40000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 40000.fstab vnd0
>>40000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>40000.dl
grep '^ [a-p]: ' 40000.dl | egrep -v "unused" | sort >>40000.tmp
echo >>40000.tmp
cat 40000.fstab >>40000.tmp
echo "=== End 40000MB disk ===" >>40000.tmp
mv 40000.tmp 40000.out
diff -up /home/src/regress/sbin/disklabel/40000.ok 40000.out
--- /home/src/regress/sbin/disklabel/40000.ok Tue Nov 9 17:54:06 2021
+++ 40000.out Fri Dec 10 08:25:59 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-40000')
FAILED
==== run-disklabel-300000 ====
rm -f 300000.tmp 300000.out
doas -n vnconfig -u vnd0 || true
rm -f diskimage
echo "=== Start 300000MB disk ===" >300000.tmp
dd if=/dev/zero of=diskimage bs=1m count=1 seek=300000 status=none
doas -n vnconfig vnd0 diskimage
doas -n fdisk -iy vnd0 >>300000.tmp
echo >>300000.tmp
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -A -p g vnd0 >300000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel -Aw -f 300000.fstab vnd0
>>300000.dl
doas -n /home/src/regress/sbin/disklabel/obj/disklabel vnd0 >>300000.dl
grep '^ [a-p]: ' 300000.dl | egrep -v "unused" | sort >>300000.tmp
echo >>300000.tmp
cat 300000.fstab >>300000.tmp
echo "=== End 300000MB disk ===" >>300000.tmp
mv 300000.tmp 300000.out
diff -up /home/src/regress/sbin/disklabel/300000.ok 300000.out
--- /home/src/regress/sbin/disklabel/300000.ok Tue Nov 9 17:54:06 2021
+++ 300000.out Fri Dec 10 08:25:59 2021
@@ -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
*** Error 1 in . (Makefile:72 'run-disklabel-300000')
FAILED
