Increase the auto partitioner's maximum /usr size to 30G.

OK bluhm, otto, deraadt

diff --git a/regress/sbin/disklabel/300000.ok b/regress/sbin/disklabel/300000.ok
index 324e2bb..2e17617 100644 (file)
--- a/regress/sbin/disklabel/300000.ok
+++ b/regress/sbin/disklabel/300000.ok
@@ -9,18 +9,18 @@ Writing MBR at offset 0.
   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:             6.0G        118097152  4.2BSD   2048 16384     1 # /usr
-  f:         12582912        118097152  4.2BSD   2048 16384     1 
-  g:             1.0G        130680064  4.2BSD   2048 16384     1 # /usr/X11R6
-  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:             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:        420807424        193594624  4.2BSD   4096 32768     1 
+  f:            29.7G        118097152  4.2BSD   2048 16384     1 # /usr
+  f:         62263040        118097152  4.2BSD   2048 16384     1 
+  g:             1.0G        180360192  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:          2097152        180360192  4.2BSD   2048 16384     1 
+  h:            20.0G        182457344  4.2BSD   2048 16384     1 # /usr/local
+  h:         41943040        182457344  4.2BSD   2048 16384     1 
+  i:             3.0G        224400384  4.2BSD   2048 16384     1 # /usr/src
+  i:          6291456        224400384  4.2BSD   2048 16384     1 
+  j:             6.0G        230691840  4.2BSD   2048 16384     1 # /usr/obj
+  j:         12582912        230691840  4.2BSD   2048 16384     1 
+  k:           177.0G        243274752  4.2BSD   4096 32768     1 # /home
+  k:        371127296        243274752  4.2BSD   4096 32768     1 
 
 /dev/vnd0a / ffs rw 1 1
 /dev/vnd0k /home ffs rw 1 2

diff --git a/regress/sbin/disklabel/90000.ok b/regress/sbin/disklabel/90000.ok
index d263eae..6ac07b3 100644 (file)
--- a/regress/sbin/disklabel/90000.ok
+++ b/regress/sbin/disklabel/90000.ok
@@ -9,18 +9,18 @@ Writing MBR at offset 0.
   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:         76361280        107960768  4.2BSD   2048 16384     1 
+  f:             9.2G         48034592  4.2BSD   2048 16384     1 # /usr
+  f:         19255040         48034592  4.2BSD   2048 16384     1 
+  g:             1.0G         67289632  4.2BSD   2048 16384     1 # /usr/X11R6
+  g:          2097152         67289632  4.2BSD   2048 16384     1 
+  h:            12.6G         69386784  4.2BSD   2048 16384     1 # /usr/local
+  h:         26371744         69386784  4.2BSD   2048 16384     1 
+  i:             3.0G         95758528  4.2BSD   2048 16384     1 # /usr/src
+  i:          6291456         95758528  4.2BSD   2048 16384     1 
+  j:             6.0G        102049984  4.2BSD   2048 16384     1 # /usr/obj
+  j:         12582912        102049984  4.2BSD   2048 16384     1 
+  k:            33.2G        114632896  4.2BSD   2048 16384     1 # /home
+  k:         69689152        114632896  4.2BSD   2048 16384     1 
 
 /dev/vnd0a / ffs rw 1 1
 /dev/vnd0k /home ffs rw 1 2

diff --git a/regress/sbin/disklabel/900000.ok b/regress/sbin/disklabel/900000.ok
index 3b01eab..63915ca 100644 (file)
--- a/regress/sbin/disklabel/900000.ok
+++ b/regress/sbin/disklabel/900000.ok
@@ -9,18 +9,18 @@ Writing MBR at offset 0.
   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:             6.0G        118097152  4.2BSD   2048 16384     1 # /usr
-  f:         12582912        118097152  4.2BSD   2048 16384     1 
-  g:             1.0G        130680064  4.2BSD   2048 16384     1 # /usr/X11R6
-  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:             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 
+  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:             3.0G        225051904  4.2BSD   2048 16384     1 # /usr/src
+  i:          6291456        225051904  4.2BSD   2048 16384     1 
+  j:             6.0G        231343360  4.2BSD   2048 16384     1 # /usr/obj
+  j:         12582912        231343360  4.2BSD   2048 16384     1 
+  k:           300.0G        243926272  4.2BSD   4096 32768     1 # /home
+  k:        629145600        243926272  4.2BSD   4096 32768     1 
 
 /dev/vnd0a / ffs rw 1 1
 /dev/vnd0k /home ffs rw 1 2

diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index b214985..1dadd42 100644 (file)
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: disklabel.8,v 1.146 2022/03/31 17:27:19 naddy Exp $
+.\"    $OpenBSD: disklabel.8,v 1.147 2022/06/25 19:19:39 mbuhl Exp $
 .\"    $NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $
 .\"
 .\" Copyright (c) 1987, 1988, 1991, 1993
@@ -33,7 +33,7 @@
 .\"
 .\"    @(#)disklabel.8 8.2 (Berkeley) 4/19/94
 .\"
-.Dd $Mdocdate: March 31 2022 $
+.Dd $Mdocdate: June 25 2022 $
 .Dt DISKLABEL 8
 .Os
 .Sh NAME
@@ -529,7 +529,7 @@ and may vary from architecture to architecture.
 swap           10% of disk.   80M \(en 2x max physical memory
 /tmp            8% of disk.  120M \(en 4G
 /var           13% of disk.   80M \(en 4G + 2x size of crash dump
-/usr           10% of disk. 1500M \(en 6G
+/usr           10% of disk. 1500M \(en 30G
 /usr/X11R6      3% of disk.  384M \(en 1G
 /usr/local     15% of disk.    1G \(en 20G
 /usr/src        2% of disk. 1500M \(en 3G

diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index 295e412..c5c8180 100644 (file)
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: editor.c,v 1.371 2022/02/14 16:10:45 krw Exp $        */
+/*     $OpenBSD: editor.c,v 1.372 2022/06/25 19:19:39 mbuhl Exp $      */
 
 /*
  * Copyright (c) 1997-2000 Todd C. Miller <millert@openbsd.org>
@@ -92,7 +92,7 @@ struct space_allocation alloc_big[] = {
        {   MEG(80),       MEG(256),  10, "swap"        },
        {  MEG(120),         GIG(4),   8, "/tmp"        },
        {   MEG(80),         GIG(4),  13, "/var"        },
-       { MEG(1500),         GIG(6),  10, "/usr"        },
+       { MEG(1500),        GIG(30),  10, "/usr"        },
        {  MEG(384),         GIG(1),   3, "/usr/X11R6"  },
        {    GIG(1),        GIG(20),  15, "/usr/local"  },
        { MEG(1500),         GIG(3),   2, "/usr/src"    },