On Sun, Oct 24, 2021 at 11:32:26AM +0100, Stuart Henderson wrote:
> The minimum needs to go up too, a cvs checkout is 1.3G already.
>
> (Not that I use auto defaults without changes anyway, they don't
> work too well for ports dev..)
Changed minimum to 1.5G.
diff --git regress/sbin/disklabel/12000.ok regress/sbin/disklabel/12000.ok
index 57045cfd829..a481efd897a 100644
--- regress/sbin/disklabel/12000.ok
+++ regress/sbin/disklabel/12000.ok
@@ -2,25 +2,25 @@
Writing MBR at offset 0.
a: 0.2G 128 4.2BSD 2048 16384 1 # /
- a: 432000 128 4.2BSD 2048 16384 1
- b: 0.2G 432128 swap
- b: 413470 432128 swap
- d: 0.2G 845600 4.2BSD 2048 16384 1 # /tmp
- d: 445440 845600 4.2BSD 2048 16384 1
- e: 0.2G 1291040 4.2BSD 2048 16384 1 # /var
- e: 488352 1291040 4.2BSD 2048 16384 1
- f: 1.6G 1779392 4.2BSD 2048 16384 1 # /usr
- f: 3321600 1779392 4.2BSD 2048 16384 1
- g: 0.4G 5100992 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 861312 5100992 4.2BSD 2048 16384 1
- h: 1.2G 5962304 4.2BSD 2048 16384 1 # /usr/local
- h: 2471584 5962304 4.2BSD 2048 16384 1
- i: 1.3G 8433888 4.2BSD 2048 16384 1 # /usr/src
- i: 2712320 8433888 4.2BSD 2048 16384 1
- j: 5.0G 11146208 4.2BSD 2048 16384 1 # /usr/obj
- j: 10585600 11146208 4.2BSD 2048 16384 1
- k: 1.4G 21731808 4.2BSD 2048 16384 1 # /home
- k: 2846176 21731808 4.2BSD 2048 16384 1
+ a: 411520 128 4.2BSD 2048 16384 1
+ b: 0.2G 411648 swap
+ b: 372510 411648 swap
+ d: 0.2G 784160 4.2BSD 2048 16384 1 # /tmp
+ d: 412672 784160 4.2BSD 2048 16384 1
+ e: 0.2G 1196832 4.2BSD 2048 16384 1 # /var
+ e: 435104 1196832 4.2BSD 2048 16384 1
+ f: 1.6G 1631936 4.2BSD 2048 16384 1 # /usr
+ f: 3280640 1631936 4.2BSD 2048 16384 1
+ g: 0.4G 4912576 4.2BSD 2048 16384 1 # /usr/X11R6
+ g: 849024 4912576 4.2BSD 2048 16384 1
+ h: 1.1G 5761600 4.2BSD 2048 16384 1 # /usr/local
+ h: 2410144 5761600 4.2BSD 2048 16384 1
+ i: 1.5G 8171744 4.2BSD 2048 16384 1 # /usr/src
+ i: 3113728 8171744 4.2BSD 2048 16384 1
+ 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
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
diff --git regress/sbin/disklabel/18000.ok regress/sbin/disklabel/18000.ok
index f66cefa2f63..9a80be91e1b 100644
--- regress/sbin/disklabel/18000.ok
+++ regress/sbin/disklabel/18000.ok
@@ -2,25 +2,25 @@
Writing MBR at offset 0.
a: 0.5G 128 4.2BSD 2048 16384 1 # /
- a: 1046400 128 4.2BSD 2048 16384 1
- b: 0.8G 1046528 swap
- b: 1642270 1046528 swap
- d: 0.7G 2688800 4.2BSD 2048 16384 1 # /tmp
- d: 1428480 2688800 4.2BSD 2048 16384 1
- e: 1.0G 4117280 4.2BSD 2048 16384 1 # /var
- e: 2085792 4117280 4.2BSD 2048 16384 1
- f: 2.2G 6203072 4.2BSD 2048 16384 1 # /usr
- f: 4550400 6203072 4.2BSD 2048 16384 1
- g: 0.6G 10753472 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 1229952 10753472 4.2BSD 2048 16384 1
- h: 2.1G 11983424 4.2BSD 2048 16384 1 # /usr/local
- h: 4314784 11983424 4.2BSD 2048 16384 1
- i: 1.4G 16298208 4.2BSD 2048 16384 1 # /usr/src
- i: 2958080 16298208 4.2BSD 2048 16384 1
- j: 5.3G 19256288 4.2BSD 2048 16384 1 # /usr/obj
- j: 11077120 19256288 4.2BSD 2048 16384 1
- k: 3.1G 30333408 4.2BSD 2048 16384 1 # /home
- k: 6532576 30333408 4.2BSD 2048 16384 1
+ a: 1025920 128 4.2BSD 2048 16384 1
+ b: 0.8G 1026048 swap
+ b: 1601310 1026048 swap
+ d: 0.7G 2627360 4.2BSD 2048 16384 1 # /tmp
+ d: 1395712 2627360 4.2BSD 2048 16384 1
+ e: 1.0G 4023072 4.2BSD 2048 16384 1 # /var
+ e: 2032544 4023072 4.2BSD 2048 16384 1
+ f: 2.2G 6055616 4.2BSD 2048 16384 1 # /usr
+ f: 4509440 6055616 4.2BSD 2048 16384 1
+ g: 0.6G 10565056 4.2BSD 2048 16384 1 # /usr/X11R6
+ g: 1217664 10565056 4.2BSD 2048 16384 1
+ h: 2.0G 11782720 4.2BSD 2048 16384 1 # /usr/local
+ h: 4253344 11782720 4.2BSD 2048 16384 1
+ i: 1.6G 16036064 4.2BSD 2048 16384 1 # /usr/src
+ i: 3359488 16036064 4.2BSD 2048 16384 1
+ 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
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
diff --git regress/sbin/disklabel/20000.ok regress/sbin/disklabel/20000.ok
index a62a439484f..60c14948bde 100644
--- regress/sbin/disklabel/20000.ok
+++ regress/sbin/disklabel/20000.ok
@@ -2,25 +2,25 @@
Writing MBR at offset 0.
a: 0.6G 128 4.2BSD 2048 16384 1 # /
- a: 1251200 128 4.2BSD 2048 16384 1
- b: 1.0G 1251328 swap
- b: 2051870 1251328 swap
- d: 0.8G 3303200 4.2BSD 2048 16384 1 # /tmp
- d: 1756160 3303200 4.2BSD 2048 16384 1
- e: 1.2G 5059360 4.2BSD 2048 16384 1 # /var
- e: 2618272 5059360 4.2BSD 2048 16384 1
- f: 2.4G 7677632 4.2BSD 2048 16384 1 # /usr
- f: 4960000 7677632 4.2BSD 2048 16384 1
- g: 0.6G 12637632 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 1352832 12637632 4.2BSD 2048 16384 1
- h: 2.4G 13990464 4.2BSD 2048 16384 1 # /usr/local
- h: 4929184 13990464 4.2BSD 2048 16384 1
- i: 1.4G 18919648 4.2BSD 2048 16384 1 # /usr/src
- i: 3040000 18919648 4.2BSD 2048 16384 1
- j: 5.4G 21959648 4.2BSD 2048 16384 1 # /usr/obj
- j: 11240960 21959648 4.2BSD 2048 16384 1
- k: 3.7G 33200608 4.2BSD 2048 16384 1 # /home
- k: 7761376 33200608 4.2BSD 2048 16384 1
+ a: 1230720 128 4.2BSD 2048 16384 1
+ b: 1.0G 1230848 swap
+ b: 2010910 1230848 swap
+ d: 0.8G 3241760 4.2BSD 2048 16384 1 # /tmp
+ d: 1723392 3241760 4.2BSD 2048 16384 1
+ e: 1.2G 4965152 4.2BSD 2048 16384 1 # /var
+ e: 2565024 4965152 4.2BSD 2048 16384 1
+ f: 2.3G 7530176 4.2BSD 2048 16384 1 # /usr
+ f: 4919040 7530176 4.2BSD 2048 16384 1
+ g: 0.6G 12449216 4.2BSD 2048 16384 1 # /usr/X11R6
+ g: 1340544 12449216 4.2BSD 2048 16384 1
+ h: 2.3G 13789760 4.2BSD 2048 16384 1 # /usr/local
+ h: 4867744 13789760 4.2BSD 2048 16384 1
+ i: 1.6G 18657504 4.2BSD 2048 16384 1 # /usr/src
+ i: 3441408 18657504 4.2BSD 2048 16384 1
+ 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
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
diff --git regress/sbin/disklabel/300000.ok regress/sbin/disklabel/300000.ok
index c43d6f75cab..20f0bd3901e 100644
--- regress/sbin/disklabel/300000.ok
+++ regress/sbin/disklabel/300000.ok
@@ -15,12 +15,12 @@ Writing MBR at offset 0.
g: 2097152 130680064 4.2BSD 2048 16384 1
h: 20.0G 132777216 4.2BSD 2048 16384 1 # /usr/local
h: 41943040 132777216 4.2BSD 2048 16384 1
- i: 2.0G 174720256 4.2BSD 2048 16384 1 # /usr/src
- i: 4194304 174720256 4.2BSD 2048 16384 1
- j: 6.0G 178914560 4.2BSD 2048 16384 1 # /usr/obj
- j: 12582912 178914560 4.2BSD 2048 16384 1
- k: 201.7G 191497472 4.2BSD 4096 32768 1 # /home
- k: 422904512 191497472 4.2BSD 4096 32768 1
+ i: 3.0G 174720256 4.2BSD 2048 16384 1 # /usr/src
+ i: 6291456 174720256 4.2BSD 2048 16384 1
+ 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
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
diff --git regress/sbin/disklabel/40000.ok regress/sbin/disklabel/40000.ok
index 918882ced28..dcb3dfd5a8a 100644
--- regress/sbin/disklabel/40000.ok
+++ regress/sbin/disklabel/40000.ok
@@ -4,23 +4,23 @@ 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: 6147870 2097280 swap
- d: 2.4G 8245152 4.2BSD 2048 16384 1 # /tmp
- d: 5032960 8245152 4.2BSD 2048 16384 1
- e: 3.8G 13278112 4.2BSD 2048 16384 1 # /var
- e: 7943072 13278112 4.2BSD 2048 16384 1
- f: 4.3G 21221184 4.2BSD 2048 16384 1 # /usr
- f: 9056000 21221184 4.2BSD 2048 16384 1
- g: 1.0G 30277184 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 2097152 30277184 4.2BSD 2048 16384 1
- h: 5.3G 32374336 4.2BSD 2048 16384 1 # /usr/local
- h: 11073184 32374336 4.2BSD 2048 16384 1
- i: 1.8G 43447520 4.2BSD 2048 16384 1 # /usr/src
- i: 3859200 43447520 4.2BSD 2048 16384 1
- j: 6.0G 47306720 4.2BSD 2048 16384 1 # /usr/obj
- j: 12582912 47306720 4.2BSD 2048 16384 1
- k: 10.5G 59889632 4.2BSD 2048 16384 1 # /home
- k: 22032352 59889632 4.2BSD 2048 16384 1
+ b: 6106910 2097280 swap
+ d: 2.4G 8204192 4.2BSD 2048 16384 1 # /tmp
+ d: 5000192 8204192 4.2BSD 2048 16384 1
+ e: 3.8G 13204384 4.2BSD 2048 16384 1 # /var
+ e: 7889824 13204384 4.2BSD 2048 16384 1
+ f: 4.3G 21094208 4.2BSD 2048 16384 1 # /usr
+ f: 9015040 21094208 4.2BSD 2048 16384 1
+ g: 1.0G 30109248 4.2BSD 2048 16384 1 # /usr/X11R6
+ g: 2097152 30109248 4.2BSD 2048 16384 1
+ h: 5.3G 32206400 4.2BSD 2048 16384 1 # /usr/local
+ h: 11011744 32206400 4.2BSD 2048 16384 1
+ i: 2.0G 43218144 4.2BSD 2048 16384 1 # /usr/src
+ i: 4260608 43218144 4.2BSD 2048 16384 1
+ 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
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
diff --git regress/sbin/disklabel/90000.ok regress/sbin/disklabel/90000.ok
index ce3ac0a0136..9abaf7faf50 100644
--- regress/sbin/disklabel/90000.ok
+++ regress/sbin/disklabel/90000.ok
@@ -4,23 +4,23 @@ Writing MBR at offset 0.
a: 1.0G 128 4.2BSD 2048 16384 1 # /
a: 2097152 128 4.2BSD 2048 16384 1
b: 7.8G 2097280 swap
- b: 16387870 2097280 swap
- d: 4.0G 18485152 4.2BSD 2048 16384 1 # /tmp
- d: 8388576 18485152 4.2BSD 2048 16384 1
- e: 10.1G 26873728 4.2BSD 2048 16384 1 # /var
- e: 21255072 26873728 4.2BSD 2048 16384 1
- f: 6.0G 48128800 4.2BSD 2048 16384 1 # /usr
- f: 12582912 48128800 4.2BSD 2048 16384 1
- g: 1.0G 60711712 4.2BSD 2048 16384 1 # /usr/X11R6
- g: 2097152 60711712 4.2BSD 2048 16384 1
- h: 12.6G 62808864 4.2BSD 2048 16384 1 # /usr/local
- h: 26433184 62808864 4.2BSD 2048 16384 1
- i: 2.0G 89242048 4.2BSD 2048 16384 1 # /usr/src
- i: 4194304 89242048 4.2BSD 2048 16384 1
- j: 6.0G 93436352 4.2BSD 2048 16384 1 # /usr/obj
- j: 12582912 93436352 4.2BSD 2048 16384 1
- k: 37.3G 106019264 4.2BSD 2048 16384 1 # /home
- k: 78302720 106019264 4.2BSD 2048 16384 1
+ b: 16346910 2097280 swap
+ d: 4.0G 18444192 4.2BSD 2048 16384 1 # /tmp
+ d: 8388576 18444192 4.2BSD 2048 16384 1
+ e: 10.1G 26832768 4.2BSD 2048 16384 1 # /var
+ e: 21201824 26832768 4.2BSD 2048 16384 1
+ f: 6.0G 48034592 4.2BSD 2048 16384 1 # /usr
+ f: 12582912 48034592 4.2BSD 2048 16384 1
+ g: 1.0G 60617504 4.2BSD 2048 16384 1 # /usr/X11R6
+ g: 2097152 60617504 4.2BSD 2048 16384 1
+ h: 12.6G 62714656 4.2BSD 2048 16384 1 # /usr/local
+ h: 26371744 62714656 4.2BSD 2048 16384 1
+ i: 3.0G 89086400 4.2BSD 2048 16384 1 # /usr/src
+ i: 6291456 89086400 4.2BSD 2048 16384 1
+ 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
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
diff --git regress/sbin/disklabel/900000.ok regress/sbin/disklabel/900000.ok
index 1ab20a962ab..3b01eaba657 100644
--- regress/sbin/disklabel/900000.ok
+++ regress/sbin/disklabel/900000.ok
@@ -15,12 +15,12 @@ Writing MBR at offset 0.
g: 2097152 130680064 4.2BSD 2048 16384 1
h: 20.0G 132777216 4.2BSD 2048 16384 1 # /usr/local
h: 41943040 132777216 4.2BSD 2048 16384 1
- i: 2.0G 174720256 4.2BSD 2048 16384 1 # /usr/src
- i: 4194304 174720256 4.2BSD 2048 16384 1
- j: 6.0G 178914560 4.2BSD 2048 16384 1 # /usr/obj
- j: 12582912 178914560 4.2BSD 2048 16384 1
- k: 300.0G 191497472 4.2BSD 4096 32768 1 # /home
- k: 629145600 191497472 4.2BSD 4096 32768 1
+ i: 3.0G 174720256 4.2BSD 2048 16384 1 # /usr/src
+ i: 6291456 174720256 4.2BSD 2048 16384 1
+ j: 6.0G 181011712 4.2BSD 2048 16384 1 # /usr/obj
+ j: 12582912 181011712 4.2BSD 2048 16384 1
+ k: 300.0G 193594624 4.2BSD 4096 32768 1 # /home
+ k: 629145600 193594624 4.2BSD 4096 32768 1
/dev/vnd0a / ffs rw 1 1
/dev/vnd0k /home ffs rw 1 2
diff --git sbin/disklabel/disklabel.8 sbin/disklabel/disklabel.8
index b38c5e74d22..28269cabe8c 100644
--- sbin/disklabel/disklabel.8
+++ sbin/disklabel/disklabel.8
@@ -532,7 +532,7 @@ swap 10% of disk. 80M \(en 2x max physical
memory
/usr 10% of disk. 1500M \(en 6G
/usr/X11R6 3% of disk. 384M \(en 1G
/usr/local 15% of disk. 1G \(en 20G
-/usr/src 2% of disk. 1300M \(en 2G
+/usr/src 2% of disk. 1500M \(en 3G
/usr/obj 4% of disk. 5G \(en 6G
/home 30% of disk. 1G \(en 300G
.Ed
@@ -568,7 +568,7 @@ swap 80M-256M 10%
/usr 1.5G-3G 5%
/usr/X11R6 512M-1G 3%
/usr/local 2G-10G 10%
-/usr/src 1G-2G 2%
+/usr/src 1G-3G 2%
/usr/obj 1.3G-2G 4%
/home 1G-* 45%
.Ed
diff --git sbin/disklabel/editor.c sbin/disklabel/editor.c
index 8708f3d59e4..ca24af2a71d 100644
--- sbin/disklabel/editor.c
+++ sbin/disklabel/editor.c
@@ -95,7 +95,7 @@ struct space_allocation alloc_big[] = {
{ MEG(1500), GIG(6), 10, "/usr" },
{ MEG(384), GIG(1), 3, "/usr/X11R6" },
{ GIG(1), GIG(20), 15, "/usr/local" },
- { MEG(1300), GIG(2), 2, "/usr/src" },
+ { MEG(1500), GIG(3), 2, "/usr/src" },
{ GIG(5), GIG(6), 4, "/usr/obj" },
{ GIG(1), GIG(300), 30, "/home" }
/* Anything beyond this leave for the user to decide */
