On 2025/11/13 22:13, H. Hartzer wrote:
> Hi bugs@,
>
> I installed 7.8 with VMM to a 12.5GB disk. I chose the automatic
> partitioning defaults, and /usr is too small to relink the kernel with.
> I used x86_64.
yeah, there are various disk sizes where disklabel -A makes bad choices
and in the worst cases just plain don't work.
> a: 213.5M 64 4.2BSD 2048 16384 1 # /
that is rather optimistic. 256 would be better but I like to go with
closer to 1G or so.
> b: 207.0M 437280 swap
> c: 12800.0M 0 unused
> d: 221.6M 861216 4.2BSD 2048 16384 1 # /tmp
> e: 245.1M 1315008 4.2BSD 2048 16384 1 # /var
it's not very fun when /var runs out of space and this is tight too.
> f: 1627.0M 1816928 4.2BSD 2048 16384 1 # /usr
> g: 422.1M 5148992 4.2BSD 2048 16384 1 # /usr/X11R6
for syspatch/reorder_kernel and some hope of sysupgrade working you
really don't want less than 2.5GB (more if /usr/X11R6 is not a separate
filesystem), typically I use single fs for /usr and X11R6 and give it
8-10GB or so.
> h: 1214.5M 6013440 4.2BSD 2048 16384 1 # /usr/local
as with many disk sizes (check src/regress/sbin/disklabel for examples),
this is too small for much use of packages.
> i: 2073.4M 8500704 4.2BSD 2048 16384 1 # /usr/src
> j: 5170.8M 12747008 4.2BSD 2048 16384 1 # /usr/obj
providing for /usr/src and /usr/obj on such a small disk doesn't seem a
smart choice. they can't really be shrunk below a certain minimum
otherwise they're not useful, but on various size disks they're burning
space badly needed elsewhere. I think they should be skipped unless the
more critical fs are above a certain minimum saner size.
here's one possible attempt at changing this, I think it's for the
better but I'm sure there will be some disagreement.
I added some more sizes to regress that I think aren't too uncommon in
VMs and removed some that are too small. I don't have a sparc64 to regen
those variants.
FWIW I never use the current disklabel defaults without at least
tweaking them a bit.
Index: sbin/disklabel/editor.c
===================================================================
RCS file: /cvs/src/sbin/disklabel/editor.c,v
diff -u -p -r1.418 editor.c
--- sbin/disklabel/editor.c 22 Mar 2024 21:49:52 -0000 1.418
+++ sbin/disklabel/editor.c 14 Nov 2025 11:59:03 -0000
@@ -89,29 +89,40 @@ struct space_allocation {
*/
/* entries for swap and var are changed by editor_allocspace() */
-struct space_allocation alloc_big[] = {
- { MEG(150), GIG(1), 5, "/" },
+struct space_allocation alloc_deluxe[] = {
+ { GIG(1), GIG(1), 5, "/" },
{ MEG(80), MEG(256), 10, "swap" },
{ MEG(120), GIG(4), 8, "/tmp" },
{ MEG(80), GIG(4), 13, "/var" },
- { MEG(1500), GIG(30), 10, "/usr" },
- { MEG(384), GIG(1), 3, "/usr/X11R6" },
- { GIG(1), GIG(20), 15, "/usr/local" },
+ { GIG(8), GIG(30), 10, "/usr" },
+ { GIG(4), GIG(30), 15, "/usr/local" },
{ GIG(2), GIG(5), 2, "/usr/src" },
{ GIG(5), GIG(6), 4, "/usr/obj" },
+ { GIG(3), GIG(8), 2, "/usr/ports" },
{ GIG(1), GIG(300), 30, "/home" }
/* Anything beyond this leave for the user to decide */
};
+/* entries for swap and var are changed by editor_allocspace() */
+struct space_allocation alloc_big[] = {
+ { GIG(1), GIG(1), 5, "/" },
+ { MEG(80), MEG(256), 10, "swap" },
+ { MEG(120), GIG(4), 8, "/tmp" },
+ { MEG(80), GIG(4), 13, "/var" },
+ { GIG(8), GIG(30), 10, "/usr" },
+ { GIG(4), GIG(30), 15, "/usr/local" },
+ { GIG(1), GIG(300), 30, "/home" }
+};
+
struct space_allocation alloc_medium[] = {
{ MEG(800), GIG(2), 5, "/" },
{ MEG(80), MEG(256), 10, "swap" },
- { MEG(1300), GIG(3), 78, "/usr" },
+ { MEG(2800), GIG(8), 78, "/usr" },
{ MEG(256), GIG(2), 7, "/home" }
};
struct space_allocation alloc_small[] = {
- { MEG(700), GIG(4), 95, "/" },
+ { GIG(2), GIG(4), 95, "/" },
{ MEG(1), MEG(256), 5, "swap" }
};
@@ -129,6 +140,7 @@ struct alloc_table {
};
struct alloc_table alloc_table_default[] = {
+ { alloc_deluxe, nitems(alloc_deluxe) },
{ alloc_big, nitems(alloc_big) },
{ alloc_medium, nitems(alloc_medium) },
{ alloc_small, nitems(alloc_small) },
@@ -664,7 +676,8 @@ allocate_space(struct disklabel *lp, con
memset(sa, 0, sizeof(sa));
for (i = 0; i < alloc_table->sz; i++) {
sa[i] = alloc_table->table[i];
- if (alloc_table->table == alloc_big)
+ if ((alloc_table->table == alloc_big)
+ || (alloc_table->table == alloc_deluxe))
allocate_physmemincr(&sa[i]);
if (xtrablks < sa[i].minsz)
return 1; /* Too few free blocks. */
Index: regress/sbin/disklabel/1000.ok
===================================================================
RCS file: regress/sbin/disklabel/1000.ok
diff -N regress/sbin/disklabel/1000.ok
--- regress/sbin/disklabel/1000.ok 10 Dec 2021 13:17:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-=== Start 1000MB disk ===
-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: 32832 2017216 swap
-
-/dev/vnd0a / ffs rw 1 1
-/dev/vnd0b none swap sw
-=== End 1000MB disk ===
Index: regress/sbin/disklabel/1000.sparc64.ok
===================================================================
RCS file: regress/sbin/disklabel/1000.sparc64.ok
diff -N regress/sbin/disklabel/1000.sparc64.ok
--- regress/sbin/disklabel/1000.sparc64.ok 7 Aug 2024 18:26:44 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-=== Start 1000MB disk ===
-Primary GPT:
-Not Found
-
-Secondary GPT:
-Not Found
-
-MBR:
-Disk: vnd0 geometry: 20500/1/100 [2050048 Sectors]
-Offset: 0 Signature: 0x0
- Starting Ending LBA Info:
- #: id C H S - C H S [ start: size ]
--------------------------------------------------------------------------------
- 0: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 1: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 2: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 3: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
-
- a: 1.0G 0 4.2BSD 2048 16384 1 # /
- a: 2017300 0 4.2BSD 2048 16384 1
- b: 0.0G 2017300 swap
- b: 32700 2017300 swap
-
-/dev/vnd0a / ffs rw 1 1
-/dev/vnd0b none swap sw
-=== End 1000MB disk ===
Index: regress/sbin/disklabel/1024.ok
===================================================================
RCS file: regress/sbin/disklabel/1024.ok
diff -N regress/sbin/disklabel/1024.ok
--- regress/sbin/disklabel/1024.ok 17 Dec 2020 20:58:17 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-=== Start 1024MB disk ===
-Writing MBR at offset 0.
-
- a: 1.0G 128 4.2BSD 2048 16384 1 # /
- a: 2063808 128 4.2BSD 2048 16384 1
- b: 0.0G 2063936 swap
- b: 35264 2063936 swap
-
-/dev/vnd0a / ffs rw 1 1
-/dev/vnd0b none swap sw
-=== End 1024MB disk ===
Index: regress/sbin/disklabel/1024.sparc64.ok
===================================================================
RCS file: regress/sbin/disklabel/1024.sparc64.ok
diff -N regress/sbin/disklabel/1024.sparc64.ok
--- regress/sbin/disklabel/1024.sparc64.ok 7 Aug 2024 18:26:44 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-=== Start 1024MB disk ===
-Primary GPT:
-Not Found
-
-Secondary GPT:
-Not Found
-
-MBR:
-Disk: vnd0 geometry: 20992/1/100 [2099200 Sectors]
-Offset: 0 Signature: 0x0
- Starting Ending LBA Info:
- #: id C H S - C H S [ start: size ]
--------------------------------------------------------------------------------
- 0: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 1: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 2: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 3: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
-
- a: 1.0G 0 4.2BSD 2048 16384 1 # /
- a: 2064000 0 4.2BSD 2048 16384 1
- b: 0.0G 2064000 swap
- b: 35200 2064000 swap
-
-/dev/vnd0a / ffs rw 1 1
-/dev/vnd0b none swap sw
-=== End 1024MB disk ===
Index: regress/sbin/disklabel/12000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/12000.ok,v
diff -u -p -r1.8 12000.ok
--- regress/sbin/disklabel/12000.ok 22 Mar 2024 21:49:52 -0000 1.8
+++ regress/sbin/disklabel/12000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,35 +1,17 @@
=== Start 12000MB disk ===
Writing MBR at offset 0.
- a: 0.2G 128 4.2BSD 2048 16384 1 # /
- a: 355392 128 4.2BSD 2048 16384 1
- b: 0.1G 355520 swap
- b: 260280 355520 swap
- d: 0.2G 615808 4.2BSD 2048 16384 1 # /tmp
- d: 322880 615808 4.2BSD 2048 16384 1
- e: 0.1G 938688 4.2BSD 2048 16384 1 # /var
- e: 289184 938688 4.2BSD 2048 16384 1
- f: 1.5G 1227872 4.2BSD 2048 16384 1 # /usr
- f: 3168416 1227872 4.2BSD 2048 16384 1
- g: 0.4G 4396288 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 815360 4396288 4.2BSD 2048 16384 1
- h: 1.1G 5211648 4.2BSD 2048 16384 1 # /usr/local
- h: 2241792 5211648 4.2BSD 2048 16384 1
- i: 2.0G 7453440 4.2BSD 2048 16384 1 # /usr/src
- i: 4213568 7453440 4.2BSD 2048 16384 1
- j: 5.0G 11667008 4.2BSD 2048 16384 1 # /usr/obj
- j: 10524320 11667008 4.2BSD 2048 16384 1
- k: 1.1G 22191328 4.2BSD 2048 16384 1 # /home
- k: 2386720 22191328 4.2BSD 2048 16384 1
+ a: 1.2G 128 4.2BSD 2048 16384 1 # /
+ a: 2464224 128 4.2BSD 2048 16384 1
+ b: 0.2G 2464352 swap
+ b: 524288 2464352 swap
+ d: 8.0G 2988640 4.2BSD 2048 16384 1 # /usr
+ d: 16777216 2988640 4.2BSD 2048 16384 1
+ e: 2.0G 19765856 4.2BSD 2048 16384 1 # /home
+ e: 4194304 19765856 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
-/dev/vnd0k /home ffs rw 1 2
-/dev/vnd0d /tmp ffs rw 1 2
-/dev/vnd0f /usr ffs rw 1 2
-/dev/vnd0g /usr/X11R6 ffs rw 1 2
-/dev/vnd0h /usr/local ffs rw 1 2
-/dev/vnd0j /usr/obj ffs rw 1 2
-/dev/vnd0i /usr/src ffs rw 1 2
-/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0e /home ffs rw 1 2
+/dev/vnd0d /usr ffs rw 1 2
/dev/vnd0b none swap sw
=== End 12000MB disk ===
Index: regress/sbin/disklabel/18000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/18000.ok,v
diff -u -p -r1.8 18000.ok
--- regress/sbin/disklabel/18000.ok 22 Mar 2024 21:49:52 -0000 1.8
+++ regress/sbin/disklabel/18000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,35 +1,26 @@
=== Start 18000MB disk ===
Writing MBR at offset 0.
- a: 0.5G 128 4.2BSD 2048 16384 1 # /
- a: 969792 128 4.2BSD 2048 16384 1
- b: 0.7G 969920 swap
- b: 1489080 969920 swap
- d: 0.6G 2459008 4.2BSD 2048 16384 1 # /tmp
- d: 1305920 2459008 4.2BSD 2048 16384 1
- e: 0.9G 3764928 4.2BSD 2048 16384 1 # /var
- e: 1886624 3764928 4.2BSD 2048 16384 1
- f: 2.1G 5651552 4.2BSD 2048 16384 1 # /usr
- f: 4397216 5651552 4.2BSD 2048 16384 1
- g: 0.6G 10048768 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 1184000 10048768 4.2BSD 2048 16384 1
- h: 1.9G 11232768 4.2BSD 2048 16384 1 # /usr/local
- h: 4084992 11232768 4.2BSD 2048 16384 1
- i: 2.1G 15317760 4.2BSD 2048 16384 1 # /usr/src
- i: 4459328 15317760 4.2BSD 2048 16384 1
- j: 5.3G 19777088 4.2BSD 2048 16384 1 # /usr/obj
- j: 11015840 19777088 4.2BSD 2048 16384 1
- k: 2.9G 30792928 4.2BSD 2048 16384 1 # /home
- k: 6073120 30792928 4.2BSD 2048 16384 1
+ a: 1.0G 128 4.2BSD 2048 16384 1 # /
+ a: 2097152 128 4.2BSD 2048 16384 1
+ b: 0.4G 2097280 swap
+ b: 857070 2097280 swap
+ d: 0.4G 2954368 4.2BSD 2048 16384 1 # /tmp
+ d: 800320 2954368 4.2BSD 2048 16384 1
+ e: 0.5G 3754688 4.2BSD 2048 16384 1 # /var
+ e: 1065024 3754688 4.2BSD 2048 16384 1
+ f: 8.3G 4819712 4.2BSD 2048 16384 1 # /usr
+ f: 17470432 4819712 4.2BSD 2048 16384 1
+ g: 4.5G 22290144 4.2BSD 2048 16384 1 # /usr/local
+ g: 9428448 22290144 4.2BSD 2048 16384 1
+ h: 2.5G 31718592 4.2BSD 2048 16384 1 # /home
+ h: 5147456 31718592 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
-/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0h /home ffs rw 1 2
/dev/vnd0d /tmp ffs rw 1 2
/dev/vnd0f /usr ffs rw 1 2
-/dev/vnd0g /usr/X11R6 ffs rw 1 2
-/dev/vnd0h /usr/local ffs rw 1 2
-/dev/vnd0j /usr/obj ffs rw 1 2
-/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0g /usr/local ffs rw 1 2
/dev/vnd0e /var ffs rw 1 2
/dev/vnd0b none swap sw
=== End 18000MB disk ===
Index: regress/sbin/disklabel/2000.ok
===================================================================
RCS file: regress/sbin/disklabel/2000.ok
diff -N regress/sbin/disklabel/2000.ok
--- regress/sbin/disklabel/2000.ok 10 Dec 2021 13:17:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-=== Start 2000MB disk ===
-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: 135232 3962816 swap
-
-/dev/vnd0a / ffs rw 1 1
-/dev/vnd0b none swap sw
-=== End 2000MB disk ===
Index: regress/sbin/disklabel/2000.sparc64.ok
===================================================================
RCS file: regress/sbin/disklabel/2000.sparc64.ok
diff -N regress/sbin/disklabel/2000.sparc64.ok
--- regress/sbin/disklabel/2000.sparc64.ok 7 Aug 2024 18:26:44 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-=== Start 2000MB disk ===
-Primary GPT:
-Not Found
-
-Secondary GPT:
-Not Found
-
-MBR:
-Disk: vnd0 geometry: 40980/1/100 [4098048 Sectors]
-Offset: 0 Signature: 0x0
- Starting Ending LBA Info:
- #: id C H S - C H S [ start: size ]
--------------------------------------------------------------------------------
- 0: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 1: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 2: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 3: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
-
- a: 1.9G 0 4.2BSD 2048 16384 1 # /
- a: 3962900 0 4.2BSD 2048 16384 1
- b: 0.1G 3962900 swap
- b: 135100 3962900 swap
-
-/dev/vnd0a / ffs rw 1 1
-/dev/vnd0b none swap sw
-=== End 2000MB disk ===
Index: regress/sbin/disklabel/20000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/20000.ok,v
diff -u -p -r1.8 20000.ok
--- regress/sbin/disklabel/20000.ok 22 Mar 2024 21:49:52 -0000 1.8
+++ regress/sbin/disklabel/20000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,35 +1,26 @@
=== Start 20000MB disk ===
Writing MBR at offset 0.
- a: 0.6G 128 4.2BSD 2048 16384 1 # /
- a: 1174592 128 4.2BSD 2048 16384 1
- b: 0.9G 1174720 swap
- b: 1898680 1174720 swap
- d: 0.8G 3073408 4.2BSD 2048 16384 1 # /tmp
- d: 1633600 3073408 4.2BSD 2048 16384 1
- e: 1.2G 4707008 4.2BSD 2048 16384 1 # /var
- e: 2419104 4707008 4.2BSD 2048 16384 1
- f: 2.3G 7126112 4.2BSD 2048 16384 1 # /usr
- f: 4806816 7126112 4.2BSD 2048 16384 1
- g: 0.6G 11932928 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 1306880 11932928 4.2BSD 2048 16384 1
- h: 2.2G 13239808 4.2BSD 2048 16384 1 # /usr/local
- h: 4699392 13239808 4.2BSD 2048 16384 1
- i: 2.2G 17939200 4.2BSD 2048 16384 1 # /usr/src
- i: 4541248 17939200 4.2BSD 2048 16384 1
- j: 5.3G 22480448 4.2BSD 2048 16384 1 # /usr/obj
- j: 11179680 22480448 4.2BSD 2048 16384 1
- k: 3.5G 33660128 4.2BSD 2048 16384 1 # /home
- k: 7301920 33660128 4.2BSD 2048 16384 1
+ a: 1.0G 128 4.2BSD 2048 16384 1 # /
+ a: 2097152 128 4.2BSD 2048 16384 1
+ b: 0.6G 2097280 swap
+ b: 1266670 2097280 swap
+ d: 0.5G 3363968 4.2BSD 2048 16384 1 # /tmp
+ d: 1128000 3363968 4.2BSD 2048 16384 1
+ e: 0.8G 4491968 4.2BSD 2048 16384 1 # /var
+ e: 1597504 4491968 4.2BSD 2048 16384 1
+ f: 8.5G 6089472 4.2BSD 2048 16384 1 # /usr
+ f: 17880032 6089472 4.2BSD 2048 16384 1
+ g: 4.8G 23969504 4.2BSD 2048 16384 1 # /usr/local
+ g: 10042848 23969504 4.2BSD 2048 16384 1
+ h: 3.3G 34012352 4.2BSD 2048 16384 1 # /home
+ h: 6949696 34012352 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
-/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0h /home ffs rw 1 2
/dev/vnd0d /tmp ffs rw 1 2
/dev/vnd0f /usr ffs rw 1 2
-/dev/vnd0g /usr/X11R6 ffs rw 1 2
-/dev/vnd0h /usr/local ffs rw 1 2
-/dev/vnd0j /usr/obj ffs rw 1 2
-/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0g /usr/local ffs rw 1 2
/dev/vnd0e /var ffs rw 1 2
/dev/vnd0b none swap sw
=== End 20000MB disk ===
Index: regress/sbin/disklabel/2200.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/2200.ok,v
diff -u -p -r1.4 2200.ok
--- regress/sbin/disklabel/2200.ok 10 Dec 2021 13:17:09 -0000 1.4
+++ regress/sbin/disklabel/2200.ok 14 Nov 2025 11:59:03 -0000
@@ -2,9 +2,9 @@
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: 155712 4351936 swap
+ a: 4489824 128 4.2BSD 2048 16384 1
+ b: 0.0G 4489952 swap
+ b: 17696 4489952 swap
/dev/vnd0a / ffs rw 1 1
/dev/vnd0b none swap sw
Index: regress/sbin/disklabel/2300.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/2300.ok,v
diff -u -p -r1.4 2300.ok
--- regress/sbin/disklabel/2300.ok 10 Dec 2021 13:17:09 -0000 1.4
+++ regress/sbin/disklabel/2300.ok 14 Nov 2025 11:59:03 -0000
@@ -2,9 +2,9 @@
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: 165952 4546496 swap
+ a: 4684384 128 4.2BSD 2048 16384 1
+ b: 0.0G 4684512 swap
+ b: 27936 4684512 swap
/dev/vnd0a / ffs rw 1 1
/dev/vnd0b none swap sw
Index: regress/sbin/disklabel/256.ok
===================================================================
RCS file: regress/sbin/disklabel/256.ok
diff -N regress/sbin/disklabel/256.ok
--- regress/sbin/disklabel/256.ok 10 Dec 2021 13:17:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-=== Start 256MB disk ===
-Writing MBR at offset 0.
-
- a: 0.3G 128 4.2BSD 2048 16384 1 # /
- a: 526208 128 4.2BSD 2048 16384 1
-
-/dev/vnd0a / ffs rw 1 1
-=== End 256MB disk ===
Index: regress/sbin/disklabel/256.sparc64.ok
===================================================================
RCS file: regress/sbin/disklabel/256.sparc64.ok
diff -N regress/sbin/disklabel/256.sparc64.ok
--- regress/sbin/disklabel/256.sparc64.ok 7 Aug 2024 18:26:44 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-=== Start 256MB disk ===
-Primary GPT:
-Not Found
-
-Secondary GPT:
-Not Found
-
-MBR:
-Disk: vnd0 geometry: 5263/1/100 [526336 Sectors]
-Offset: 0 Signature: 0x0
- Starting Ending LBA Info:
- #: id C H S - C H S [ start: size ]
--------------------------------------------------------------------------------
- 0: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 1: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 2: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 3: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
-
- a: 0.3G 0 4.2BSD 2048 16384 1 # /
- a: 526300 0 4.2BSD 2048 16384 1
-
-/dev/vnd0a / ffs rw 1 1
-=== End 256MB disk ===
Index: regress/sbin/disklabel/3000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/3000.ok,v
diff -u -p -r1.4 3000.ok
--- regress/sbin/disklabel/3000.ok 10 Dec 2021 13:17:09 -0000 1.4
+++ regress/sbin/disklabel/3000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,17 +1,11 @@
=== Start 3000MB disk ===
Writing MBR at offset 0.
- a: 0.8G 128 4.2BSD 2048 16384 1 # /
- a: 1696224 128 4.2BSD 2048 16384 1
- b: 0.1G 1696352 swap
- b: 279530 1696352 swap
- 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: 605408 5540640 4.2BSD 2048 16384 1
+ a: 2.9G 128 4.2BSD 2048 16384 1 # /
+ a: 6046304 128 4.2BSD 2048 16384 1
+ b: 0.0G 6046432 swap
+ b: 99616 6046432 swap
/dev/vnd0a / ffs rw 1 1
-/dev/vnd0e /home ffs rw 1 2
-/dev/vnd0d /usr ffs rw 1 2
/dev/vnd0b none swap sw
=== End 3000MB disk ===
Index: regress/sbin/disklabel/300000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/300000.ok,v
diff -u -p -r1.9 300000.ok
--- regress/sbin/disklabel/300000.ok 22 Mar 2024 21:49:52 -0000 1.9
+++ regress/sbin/disklabel/300000.ok 14 Nov 2025 11:59:03 -0000
@@ -7,29 +7,29 @@ Writing MBR at offset 0.
b: 33423744 2097280 swap
d: 4.0G 35521024 4.2BSD 2048 16384 1 # /tmp
d: 8388608 35521024 4.2BSD 2048 16384 1
- e: 35.4G 43909632 4.2BSD 2048 16384 1 # /var
- e: 74187520 43909632 4.2BSD 2048 16384 1
- f: 29.6G 118097152 4.2BSD 2048 16384 1 # /usr
- f: 62150816 118097152 4.2BSD 2048 16384 1
- g: 1.0G 180247968 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 2097152 180247968 4.2BSD 2048 16384 1
- h: 20.0G 182345120 4.2BSD 2048 16384 1 # /usr/local
- h: 41943040 182345120 4.2BSD 2048 16384 1
- i: 5.0G 224288160 4.2BSD 2048 16384 1 # /usr/src
- i: 10485760 224288160 4.2BSD 2048 16384 1
- j: 6.0G 234773920 4.2BSD 2048 16384 1 # /usr/obj
- j: 12582912 234773920 4.2BSD 2048 16384 1
- k: 175.0G 247356864 4.2BSD 4096 32768 1 # /home
- k: 367045184 247356864 4.2BSD 4096 32768 1
+ e: 35.0G 43909632 4.2BSD 2048 16384 1 # /var
+ e: 73418400 43909632 4.2BSD 2048 16384 1
+ f: 30.0G 117328032 4.2BSD 2048 16384 1 # /usr
+ f: 62914560 117328032 4.2BSD 2048 16384 1
+ g: 30.0G 180242592 4.2BSD 2048 16384 1 # /usr/local
+ g: 62914560 180242592 4.2BSD 2048 16384 1
+ h: 5.0G 243157152 4.2BSD 2048 16384 1 # /usr/src
+ h: 10485760 243157152 4.2BSD 2048 16384 1
+ i: 6.0G 253642912 4.2BSD 2048 16384 1 # /usr/obj
+ i: 12582912 253642912 4.2BSD 2048 16384 1
+ j: 8.0G 266225824 4.2BSD 2048 16384 1 # /usr/ports
+ j: 16777216 266225824 4.2BSD 2048 16384 1
+ k: 158.0G 283003072 4.2BSD 4096 32768 1 # /home
+ k: 331398976 283003072 4.2BSD 4096 32768 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
/dev/vnd0d /tmp ffs rw 1 2
/dev/vnd0f /usr ffs rw 1 2
-/dev/vnd0g /usr/X11R6 ffs rw 1 2
-/dev/vnd0h /usr/local ffs rw 1 2
-/dev/vnd0j /usr/obj ffs rw 1 2
-/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0g /usr/local ffs rw 1 2
+/dev/vnd0i /usr/obj ffs rw 1 2
+/dev/vnd0j /usr/ports ffs rw 1 2
+/dev/vnd0h /usr/src ffs rw 1 2
/dev/vnd0e /var ffs rw 1 2
/dev/vnd0b none swap sw
=== End 300000MB disk ===
Index: regress/sbin/disklabel/32000.ok
===================================================================
RCS file: regress/sbin/disklabel/32000.ok
diff -N regress/sbin/disklabel/32000.ok
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ regress/sbin/disklabel/32000.ok 14 Nov 2025 11:59:03 -0000
@@ -0,0 +1,35 @@
+=== Start 32000MB disk ===
+Writing MBR at offset 0.
+
+ a: 1.0G 128 4.2BSD 2048 16384 1 # /
+ a: 2097152 128 4.2BSD 2048 16384 1
+ b: 0.8G 2097280 swap
+ b: 1627120 2097280 swap
+ d: 0.7G 3724416 4.2BSD 2048 16384 1 # /tmp
+ d: 1416352 3724416 4.2BSD 2048 16384 1
+ e: 1.0G 5140768 4.2BSD 2048 16384 1 # /var
+ e: 2066080 5140768 4.2BSD 2048 16384 1
+ f: 8.7G 7206848 4.2BSD 2048 16384 1 # /usr
+ f: 18240480 7206848 4.2BSD 2048 16384 1
+ g: 5.0G 25447328 4.2BSD 2048 16384 1 # /usr/local
+ g: 10583520 25447328 4.2BSD 2048 16384 1
+ h: 2.1G 36030848 4.2BSD 2048 16384 1 # /usr/src
+ h: 4486944 36030848 4.2BSD 2048 16384 1
+ i: 5.3G 40517792 4.2BSD 2048 16384 1 # /usr/obj
+ i: 11071072 40517792 4.2BSD 2048 16384 1
+ j: 3.1G 51588864 4.2BSD 2048 16384 1 # /usr/ports
+ j: 6584096 51588864 4.2BSD 2048 16384 1
+ k: 3.5G 58172960 4.2BSD 2048 16384 1 # /home
+ k: 7365088 58172960 4.2BSD 2048 16384 1
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/local ffs rw 1 2
+/dev/vnd0i /usr/obj ffs rw 1 2
+/dev/vnd0j /usr/ports ffs rw 1 2
+/dev/vnd0h /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 32000MB disk ===
Index: regress/sbin/disklabel/3500.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/3500.ok,v
diff -u -p -r1.4 3500.ok
--- regress/sbin/disklabel/3500.ok 10 Dec 2021 13:17:09 -0000 1.4
+++ regress/sbin/disklabel/3500.ok 14 Nov 2025 11:59:03 -0000
@@ -1,17 +1,11 @@
=== Start 3500MB disk ===
Writing MBR at offset 0.
- a: 0.8G 128 4.2BSD 2048 16384 1 # /
- a: 1747424 128 4.2BSD 2048 16384 1
- b: 0.2G 1747552 swap
- b: 381930 1747552 swap
- 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: 677088 6492960 4.2BSD 2048 16384 1
+ a: 3.3G 128 4.2BSD 2048 16384 1 # /
+ a: 7019104 128 4.2BSD 2048 16384 1
+ b: 0.1G 7019232 swap
+ b: 150816 7019232 swap
/dev/vnd0a / ffs rw 1 1
-/dev/vnd0e /home ffs rw 1 2
-/dev/vnd0d /usr ffs rw 1 2
/dev/vnd0b none swap sw
=== End 3500MB disk ===
Index: regress/sbin/disklabel/400.ok
===================================================================
RCS file: regress/sbin/disklabel/400.ok
diff -N regress/sbin/disklabel/400.ok
--- regress/sbin/disklabel/400.ok 10 Dec 2021 13:17:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,8 +0,0 @@
-=== Start 400MB disk ===
-Writing MBR at offset 0.
-
- a: 0.4G 128 4.2BSD 2048 16384 1 # /
- a: 821120 128 4.2BSD 2048 16384 1
-
-/dev/vnd0a / ffs rw 1 1
-=== End 400MB disk ===
Index: regress/sbin/disklabel/400.sparc64.ok
===================================================================
RCS file: regress/sbin/disklabel/400.sparc64.ok
diff -N regress/sbin/disklabel/400.sparc64.ok
--- regress/sbin/disklabel/400.sparc64.ok 7 Aug 2024 18:26:44 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,23 +0,0 @@
-=== Start 400MB disk ===
-Primary GPT:
-Not Found
-
-Secondary GPT:
-Not Found
-
-MBR:
-Disk: vnd0 geometry: 8212/1/100 [821248 Sectors]
-Offset: 0 Signature: 0x0
- Starting Ending LBA Info:
- #: id C H S - C H S [ start: size ]
--------------------------------------------------------------------------------
- 0: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 1: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 2: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 3: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
-
- a: 0.4G 0 4.2BSD 2048 16384 1 # /
- a: 821200 0 4.2BSD 2048 16384 1
-
-/dev/vnd0a / ffs rw 1 1
-=== End 400MB disk ===
Index: regress/sbin/disklabel/4000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/4000.ok,v
diff -u -p -r1.4 4000.ok
--- regress/sbin/disklabel/4000.ok 10 Dec 2021 13:17:09 -0000 1.4
+++ regress/sbin/disklabel/4000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,14 +1,14 @@
=== Start 4000MB disk ===
Writing MBR at offset 0.
- a: 0.9G 128 4.2BSD 2048 16384 1 # /
- a: 1798624 128 4.2BSD 2048 16384 1
- b: 0.2G 1798752 swap
- b: 484330 1798752 swap
- 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: 748768 7445280 4.2BSD 2048 16384 1
+ a: 0.8G 128 4.2BSD 2048 16384 1 # /
+ a: 1645024 128 4.2BSD 2048 16384 1
+ b: 0.1G 1645152 swap
+ b: 177130 1645152 swap
+ d: 2.8G 1822304 4.2BSD 2048 16384 1 # /usr
+ d: 5838016 1822304 4.2BSD 2048 16384 1
+ e: 0.3G 7660320 4.2BSD 2048 16384 1 # /home
+ e: 533728 7660320 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0e /home ffs rw 1 2
Index: regress/sbin/disklabel/40000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/40000.ok,v
diff -u -p -r1.8 40000.ok
--- regress/sbin/disklabel/40000.ok 22 Mar 2024 21:49:52 -0000 1.8
+++ regress/sbin/disklabel/40000.ok 14 Nov 2025 11:59:03 -0000
@@ -3,33 +3,33 @@ Writing MBR at offset 0.
a: 1.0G 128 4.2BSD 2048 16384 1 # /
a: 2097152 128 4.2BSD 2048 16384 1
- b: 2.9G 2097280 swap
- b: 5994680 2097280 swap
- d: 2.3G 8091968 4.2BSD 2048 16384 1 # /tmp
- d: 4910400 8091968 4.2BSD 2048 16384 1
- e: 3.7G 13002368 4.2BSD 2048 16384 1 # /var
- e: 7743904 13002368 4.2BSD 2048 16384 1
- f: 4.2G 20746272 4.2BSD 2048 16384 1 # /usr
- f: 8902816 20746272 4.2BSD 2048 16384 1
- g: 1.0G 29649088 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 2097152 29649088 4.2BSD 2048 16384 1
- h: 5.2G 31746240 4.2BSD 2048 16384 1 # /usr/local
- h: 10843392 31746240 4.2BSD 2048 16384 1
- i: 2.6G 42589632 4.2BSD 2048 16384 1 # /usr/src
- i: 5360448 42589632 4.2BSD 2048 16384 1
- j: 6.0G 47950080 4.2BSD 2048 16384 1 # /usr/obj
- j: 12582912 47950080 4.2BSD 2048 16384 1
- k: 10.2G 60532992 4.2BSD 2048 16384 1 # /home
- k: 21389056 60532992 4.2BSD 2048 16384 1
+ b: 1.6G 2097280 swap
+ b: 3265520 2097280 swap
+ d: 1.3G 5362816 4.2BSD 2048 16384 1 # /tmp
+ d: 2727072 5362816 4.2BSD 2048 16384 1
+ e: 2.0G 8089888 4.2BSD 2048 16384 1 # /var
+ e: 4196000 8089888 4.2BSD 2048 16384 1
+ f: 9.5G 12285888 4.2BSD 2048 16384 1 # /usr
+ f: 19878880 12285888 4.2BSD 2048 16384 1
+ g: 6.2G 32164768 4.2BSD 2048 16384 1 # /usr/local
+ g: 13041120 32164768 4.2BSD 2048 16384 1
+ h: 2.3G 45205888 4.2BSD 2048 16384 1 # /usr/src
+ h: 4814624 45205888 4.2BSD 2048 16384 1
+ i: 5.6G 50020512 4.2BSD 2048 16384 1 # /usr/obj
+ i: 11726432 50020512 4.2BSD 2048 16384 1
+ j: 3.3G 61746944 4.2BSD 2048 16384 1 # /usr/ports
+ j: 6911776 61746944 4.2BSD 2048 16384 1
+ k: 6.3G 68658720 4.2BSD 2048 16384 1 # /home
+ k: 13263328 68658720 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
/dev/vnd0d /tmp ffs rw 1 2
/dev/vnd0f /usr ffs rw 1 2
-/dev/vnd0g /usr/X11R6 ffs rw 1 2
-/dev/vnd0h /usr/local ffs rw 1 2
-/dev/vnd0j /usr/obj ffs rw 1 2
-/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0g /usr/local ffs rw 1 2
+/dev/vnd0i /usr/obj ffs rw 1 2
+/dev/vnd0j /usr/ports ffs rw 1 2
+/dev/vnd0h /usr/src ffs rw 1 2
/dev/vnd0e /var ffs rw 1 2
/dev/vnd0b none swap sw
=== End 40000MB disk ===
Index: regress/sbin/disklabel/4100.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/4100.ok,v
diff -u -p -r1.4 4100.ok
--- regress/sbin/disklabel/4100.ok 10 Dec 2021 13:17:09 -0000 1.4
+++ regress/sbin/disklabel/4100.ok 14 Nov 2025 11:59:03 -0000
@@ -1,14 +1,14 @@
=== Start 4100MB disk ===
Writing MBR at offset 0.
- a: 0.9G 128 4.2BSD 2048 16384 1 # /
- a: 1808864 128 4.2BSD 2048 16384 1
- b: 0.2G 1808992 swap
- b: 504810 1808992 swap
- 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: 763104 7635744 4.2BSD 2048 16384 1
+ a: 0.8G 128 4.2BSD 2048 16384 1 # /
+ a: 1655264 128 4.2BSD 2048 16384 1
+ b: 0.1G 1655392 swap
+ b: 197610 1655392 swap
+ d: 2.9G 1853024 4.2BSD 2048 16384 1 # /usr
+ d: 5997760 1853024 4.2BSD 2048 16384 1
+ e: 0.3G 7850784 4.2BSD 2048 16384 1 # /home
+ e: 548064 7850784 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0e /home ffs rw 1 2
Index: regress/sbin/disklabel/5000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/5000.ok,v
diff -u -p -r1.4 5000.ok
--- regress/sbin/disklabel/5000.ok 10 Dec 2021 13:17:09 -0000 1.4
+++ regress/sbin/disklabel/5000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,14 +1,14 @@
=== Start 5000MB disk ===
Writing MBR at offset 0.
- a: 0.9G 128 4.2BSD 2048 16384 1 # /
- a: 1901024 128 4.2BSD 2048 16384 1
- b: 0.2G 1901152 swap
- b: 524288 1901152 swap
- 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: 1525152 8716896 4.2BSD 2048 16384 1
+ a: 0.8G 128 4.2BSD 2048 16384 1 # /
+ a: 1747424 128 4.2BSD 2048 16384 1
+ b: 0.2G 1747552 swap
+ b: 381930 1747552 swap
+ d: 3.5G 2129504 4.2BSD 2048 16384 1 # /usr
+ d: 7435456 2129504 4.2BSD 2048 16384 1
+ e: 0.3G 9564960 4.2BSD 2048 16384 1 # /home
+ e: 677088 9564960 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0e /home ffs rw 1 2
Index: regress/sbin/disklabel/6000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/6000.ok,v
diff -u -p -r1.4 6000.ok
--- regress/sbin/disklabel/6000.ok 10 Dec 2021 13:17:09 -0000 1.4
+++ regress/sbin/disklabel/6000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,14 +1,14 @@
=== Start 6000MB disk ===
Writing MBR at offset 0.
- a: 1.0G 128 4.2BSD 2048 16384 1 # /
- a: 2003424 128 4.2BSD 2048 16384 1
- b: 0.2G 2003552 swap
- b: 524288 2003552 swap
- 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: 3470752 8819296 4.2BSD 2048 16384 1
+ a: 0.9G 128 4.2BSD 2048 16384 1 # /
+ a: 1849824 128 4.2BSD 2048 16384 1
+ b: 0.2G 1849952 swap
+ b: 524288 1849952 swap
+ d: 4.3G 2374240 4.2BSD 2048 16384 1 # /usr
+ d: 9032928 2374240 4.2BSD 2048 16384 1
+ e: 0.4G 11407168 4.2BSD 2048 16384 1 # /home
+ e: 882880 11407168 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0e /home ffs rw 1 2
Index: regress/sbin/disklabel/64000.ok
===================================================================
RCS file: regress/sbin/disklabel/64000.ok
diff -N regress/sbin/disklabel/64000.ok
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ regress/sbin/disklabel/64000.ok 14 Nov 2025 11:59:03 -0000
@@ -0,0 +1,35 @@
+=== Start 64000MB disk ===
+Writing MBR at offset 0.
+
+ a: 1.0G 128 4.2BSD 2048 16384 1 # /
+ a: 2097152 128 4.2BSD 2048 16384 1
+ b: 3.9G 2097280 swap
+ b: 8180720 2097280 swap
+ d: 3.2G 10278016 4.2BSD 2048 16384 1 # /tmp
+ d: 6659232 10278016 4.2BSD 2048 16384 1
+ e: 5.0G 16937248 4.2BSD 2048 16384 1 # /var
+ e: 10585760 16937248 4.2BSD 2048 16384 1
+ f: 11.8G 27523008 4.2BSD 2048 16384 1 # /usr
+ f: 24794080 27523008 4.2BSD 2048 16384 1
+ g: 9.7G 52317088 4.2BSD 2048 16384 1 # /usr/local
+ g: 20413920 52317088 4.2BSD 2048 16384 1
+ h: 2.8G 72731008 4.2BSD 2048 16384 1 # /usr/src
+ h: 5797664 72731008 4.2BSD 2048 16384 1
+ i: 6.0G 78528672 4.2BSD 2048 16384 1 # /usr/obj
+ i: 12582912 78528672 4.2BSD 2048 16384 1
+ j: 3.8G 91111584 4.2BSD 2048 16384 1 # /usr/ports
+ j: 7894816 91111584 4.2BSD 2048 16384 1
+ k: 15.3G 99006400 4.2BSD 2048 16384 1 # /home
+ k: 32067648 99006400 4.2BSD 2048 16384 1
+
+/dev/vnd0a / ffs rw 1 1
+/dev/vnd0k /home ffs rw 1 2
+/dev/vnd0d /tmp ffs rw 1 2
+/dev/vnd0f /usr ffs rw 1 2
+/dev/vnd0g /usr/local ffs rw 1 2
+/dev/vnd0i /usr/obj ffs rw 1 2
+/dev/vnd0j /usr/ports ffs rw 1 2
+/dev/vnd0h /usr/src ffs rw 1 2
+/dev/vnd0e /var ffs rw 1 2
+/dev/vnd0b none swap sw
+=== End 64000MB disk ===
Index: regress/sbin/disklabel/7000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/7000.ok,v
diff -u -p -r1.3 7000.ok
--- regress/sbin/disklabel/7000.ok 17 Dec 2020 20:58:17 -0000 1.3
+++ regress/sbin/disklabel/7000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,14 +1,14 @@
=== Start 7000MB disk ===
Writing MBR at offset 0.
- a: 1.0G 128 4.2BSD 2048 16384 1 # /
- a: 2105824 128 4.2BSD 2048 16384 1
- b: 0.2G 2105952 swap
- b: 524288 2105952 swap
- d: 3.0G 2630240 4.2BSD 2048 16384 1 # /usr
- d: 6291456 2630240 4.2BSD 2048 16384 1
- e: 2.0G 8921696 4.2BSD 2048 16384 1 # /home
- e: 4194304 8921696 4.2BSD 2048 16384 1
+ a: 0.9G 128 4.2BSD 2048 16384 1 # /
+ a: 1952224 128 4.2BSD 2048 16384 1
+ b: 0.2G 1952352 swap
+ b: 524288 1952352 swap
+ d: 5.1G 2476640 4.2BSD 2048 16384 1 # /usr
+ d: 10630368 2476640 4.2BSD 2048 16384 1
+ e: 0.6G 13107008 4.2BSD 2048 16384 1 # /home
+ e: 1231040 13107008 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0e /home ffs rw 1 2
Index: regress/sbin/disklabel/800.ok
===================================================================
RCS file: regress/sbin/disklabel/800.ok
diff -N regress/sbin/disklabel/800.ok
--- regress/sbin/disklabel/800.ok 10 Dec 2021 13:17:09 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,11 +0,0 @@
-=== Start 800MB disk ===
-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: 12352 1628096 swap
-
-/dev/vnd0a / ffs rw 1 1
-/dev/vnd0b none swap sw
-=== End 800MB disk ===
Index: regress/sbin/disklabel/800.sparc64.ok
===================================================================
RCS file: regress/sbin/disklabel/800.sparc64.ok
diff -N regress/sbin/disklabel/800.sparc64.ok
--- regress/sbin/disklabel/800.sparc64.ok 7 Aug 2024 18:26:44 -0000
1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,26 +0,0 @@
-=== Start 800MB disk ===
-Primary GPT:
-Not Found
-
-Secondary GPT:
-Not Found
-
-MBR:
-Disk: vnd0 geometry: 16404/1/100 [1640448 Sectors]
-Offset: 0 Signature: 0x0
- Starting Ending LBA Info:
- #: id C H S - C H S [ start: size ]
--------------------------------------------------------------------------------
- 0: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 1: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 2: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
- 3: 00 0 0 0 - 0 0 0 [ 0: 0 ] Unused
-
- a: 0.8G 0 4.2BSD 2048 16384 1 # /
- a: 1628200 0 4.2BSD 2048 16384 1
- b: 0.0G 1628200 swap
- b: 12200 1628200 swap
-
-/dev/vnd0a / ffs rw 1 1
-/dev/vnd0b none swap sw
-=== End 800MB disk ===
Index: regress/sbin/disklabel/8000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/8000.ok,v
diff -u -p -r1.3 8000.ok
--- regress/sbin/disklabel/8000.ok 17 Dec 2020 20:58:17 -0000 1.3
+++ regress/sbin/disklabel/8000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,14 +1,14 @@
=== Start 8000MB disk ===
Writing MBR at offset 0.
- a: 1.1G 128 4.2BSD 2048 16384 1 # /
- a: 2208224 128 4.2BSD 2048 16384 1
- b: 0.2G 2208352 swap
- b: 524288 2208352 swap
- d: 3.0G 2732640 4.2BSD 2048 16384 1 # /usr
- d: 6291456 2732640 4.2BSD 2048 16384 1
- e: 2.0G 9024096 4.2BSD 2048 16384 1 # /home
- e: 4194304 9024096 4.2BSD 2048 16384 1
+ a: 1.0G 128 4.2BSD 2048 16384 1 # /
+ a: 2054624 128 4.2BSD 2048 16384 1
+ b: 0.2G 2054752 swap
+ b: 524288 2054752 swap
+ d: 5.8G 2579040 4.2BSD 2048 16384 1 # /usr
+ d: 12227808 2579040 4.2BSD 2048 16384 1
+ e: 0.8G 14806848 4.2BSD 2048 16384 1 # /home
+ e: 1579200 14806848 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0e /home ffs rw 1 2
Index: regress/sbin/disklabel/9000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/9000.ok,v
diff -u -p -r1.3 9000.ok
--- regress/sbin/disklabel/9000.ok 17 Dec 2020 20:58:17 -0000 1.3
+++ regress/sbin/disklabel/9000.ok 14 Nov 2025 11:59:03 -0000
@@ -1,14 +1,14 @@
=== Start 9000MB disk ===
Writing MBR at offset 0.
- a: 1.1G 128 4.2BSD 2048 16384 1 # /
- a: 2310624 128 4.2BSD 2048 16384 1
- b: 0.2G 2310752 swap
- b: 524288 2310752 swap
- d: 3.0G 2835040 4.2BSD 2048 16384 1 # /usr
- d: 6291456 2835040 4.2BSD 2048 16384 1
- e: 2.0G 9126496 4.2BSD 2048 16384 1 # /home
- e: 4194304 9126496 4.2BSD 2048 16384 1
+ a: 1.0G 128 4.2BSD 2048 16384 1 # /
+ a: 2157024 128 4.2BSD 2048 16384 1
+ b: 0.2G 2157152 swap
+ b: 524288 2157152 swap
+ d: 6.6G 2681440 4.2BSD 2048 16384 1 # /usr
+ d: 13825248 2681440 4.2BSD 2048 16384 1
+ e: 0.9G 16506688 4.2BSD 2048 16384 1 # /home
+ e: 1927360 16506688 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0e /home ffs rw 1 2
Index: regress/sbin/disklabel/90000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/90000.ok,v
diff -u -p -r1.10 90000.ok
--- regress/sbin/disklabel/90000.ok 22 Mar 2024 21:49:52 -0000 1.10
+++ regress/sbin/disklabel/90000.ok 14 Nov 2025 11:59:03 -0000
@@ -3,33 +3,33 @@ Writing MBR at offset 0.
a: 1.0G 128 4.2BSD 2048 16384 1 # /
a: 2097152 128 4.2BSD 2048 16384 1
- b: 7.7G 2097280 swap
- b: 16234680 2097280 swap
- d: 4.0G 18331968 4.2BSD 2048 16384 1 # /tmp
- d: 8388576 18331968 4.2BSD 2048 16384 1
- e: 10.0G 26720544 4.2BSD 2048 16384 1 # /var
- e: 21055904 26720544 4.2BSD 2048 16384 1
- f: 9.1G 47776448 4.2BSD 2048 16384 1 # /usr
- f: 19142816 47776448 4.2BSD 2048 16384 1
- g: 1.0G 66919264 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 2097152 66919264 4.2BSD 2048 16384 1
- h: 12.5G 69016416 4.2BSD 2048 16384 1 # /usr/local
- h: 26203392 69016416 4.2BSD 2048 16384 1
- i: 3.5G 95219808 4.2BSD 2048 16384 1 # /usr/src
- i: 7408448 95219808 4.2BSD 2048 16384 1
- j: 6.0G 102628256 4.2BSD 2048 16384 1 # /usr/obj
- j: 12582912 102628256 4.2BSD 2048 16384 1
- k: 33.0G 115211168 4.2BSD 2048 16384 1 # /home
- k: 69110880 115211168 4.2BSD 2048 16384 1
+ b: 6.4G 2097280 swap
+ b: 13505520 2097280 swap
+ d: 4.0G 15602816 4.2BSD 2048 16384 1 # /tmp
+ d: 8388576 15602816 4.2BSD 2048 16384 1
+ e: 8.3G 23991392 4.2BSD 2048 16384 1 # /var
+ e: 17508000 23991392 4.2BSD 2048 16384 1
+ f: 14.4G 41499392 4.2BSD 2048 16384 1 # /usr
+ f: 30118880 41499392 4.2BSD 2048 16384 1
+ g: 13.5G 71618272 4.2BSD 2048 16384 1 # /usr/local
+ g: 28401120 71618272 4.2BSD 2048 16384 1
+ h: 3.3G 100019392 4.2BSD 2048 16384 1 # /usr/src
+ h: 6862624 100019392 4.2BSD 2048 16384 1
+ i: 6.0G 106882016 4.2BSD 2048 16384 1 # /usr/obj
+ i: 12582912 106882016 4.2BSD 2048 16384 1
+ j: 4.3G 119464928 4.2BSD 2048 16384 1 # /usr/ports
+ j: 8959776 119464928 4.2BSD 2048 16384 1
+ k: 26.7G 128424704 4.2BSD 2048 16384 1 # /home
+ k: 55897344 128424704 4.2BSD 2048 16384 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
/dev/vnd0d /tmp ffs rw 1 2
/dev/vnd0f /usr ffs rw 1 2
-/dev/vnd0g /usr/X11R6 ffs rw 1 2
-/dev/vnd0h /usr/local ffs rw 1 2
-/dev/vnd0j /usr/obj ffs rw 1 2
-/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0g /usr/local ffs rw 1 2
+/dev/vnd0i /usr/obj ffs rw 1 2
+/dev/vnd0j /usr/ports ffs rw 1 2
+/dev/vnd0h /usr/src ffs rw 1 2
/dev/vnd0e /var ffs rw 1 2
/dev/vnd0b none swap sw
=== End 90000MB disk ===
Index: regress/sbin/disklabel/900000.ok
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/900000.ok,v
diff -u -p -r1.8 900000.ok
--- regress/sbin/disklabel/900000.ok 22 Mar 2024 21:49:52 -0000 1.8
+++ regress/sbin/disklabel/900000.ok 14 Nov 2025 11:59:03 -0000
@@ -11,25 +11,25 @@ Writing MBR at offset 0.
e: 74187520 43909632 4.2BSD 2048 16384 1
f: 30.0G 118097152 4.2BSD 2048 16384 1 # /usr
f: 62914560 118097152 4.2BSD 2048 16384 1
- g: 1.0G 181011712 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 2097152 181011712 4.2BSD 2048 16384 1
- h: 20.0G 183108864 4.2BSD 2048 16384 1 # /usr/local
- h: 41943040 183108864 4.2BSD 2048 16384 1
- i: 5.0G 225051904 4.2BSD 2048 16384 1 # /usr/src
- i: 10485760 225051904 4.2BSD 2048 16384 1
- j: 6.0G 235537664 4.2BSD 2048 16384 1 # /usr/obj
- j: 12582912 235537664 4.2BSD 2048 16384 1
- k: 300.0G 248120576 4.2BSD 4096 32768 1 # /home
- k: 629145600 248120576 4.2BSD 4096 32768 1
+ g: 30.0G 181011712 4.2BSD 2048 16384 1 # /usr/local
+ g: 62914560 181011712 4.2BSD 2048 16384 1
+ h: 5.0G 243926272 4.2BSD 2048 16384 1 # /usr/src
+ h: 10485760 243926272 4.2BSD 2048 16384 1
+ i: 6.0G 254412032 4.2BSD 2048 16384 1 # /usr/obj
+ i: 12582912 254412032 4.2BSD 2048 16384 1
+ j: 8.0G 266994944 4.2BSD 2048 16384 1 # /usr/ports
+ j: 16777216 266994944 4.2BSD 2048 16384 1
+ k: 300.0G 283772160 4.2BSD 4096 32768 1 # /home
+ k: 629145600 283772160 4.2BSD 4096 32768 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
/dev/vnd0d /tmp ffs rw 1 2
/dev/vnd0f /usr ffs rw 1 2
-/dev/vnd0g /usr/X11R6 ffs rw 1 2
-/dev/vnd0h /usr/local ffs rw 1 2
-/dev/vnd0j /usr/obj ffs rw 1 2
-/dev/vnd0i /usr/src ffs rw 1 2
+/dev/vnd0g /usr/local ffs rw 1 2
+/dev/vnd0i /usr/obj ffs rw 1 2
+/dev/vnd0j /usr/ports ffs rw 1 2
+/dev/vnd0h /usr/src ffs rw 1 2
/dev/vnd0e /var ffs rw 1 2
/dev/vnd0b none swap sw
=== End 900000MB disk ===
Index: regress/sbin/disklabel/Makefile
===================================================================
RCS file: /cvs/src/regress/sbin/disklabel/Makefile,v
diff -u -p -r1.8 Makefile
--- regress/sbin/disklabel/Makefile 12 Oct 2023 16:59:23 -0000 1.8
+++ regress/sbin/disklabel/Makefile 14 Nov 2025 11:59:03 -0000
@@ -19,12 +19,6 @@
# Regress tests for disklabel auto layout
DISK_SIZES = 18000 \
- 256 \
- 400 \
- 800 \
- 1000 \
- 1024 \
- 2000 \
2200 \
2300 \
3000 \
@@ -36,6 +30,10 @@ DISK_SIZES = 18000 \
7000 \
8000 \
9000 \
+ 20000 \
+ 32000 \
+ 40000 \
+ 64000 \
90000 \
12000 \
20000 \
