Download raw body.
increase /usr/src partition
On Fri, Mar 22, 2024 at 04:14:06PM +0100, jan@openbsd.org wrote:
> On Fri, Mar 22, 2024 at 03:15:41PM +0100, Otto Moerbeek wrote:
> > On Fri, Mar 22, 2024 at 08:05:50AM -0600, Theo de Raadt wrote:
> > > Seems reasonable.
> > >
> > > otto?
> >
> > yes, but there's also a man page and a regression test
>
> of course.
>
> ok?
Passed release build and regress run. OK bluhm@
> Index: sbin/disklabel/disklabel.8
> ===================================================================
> RCS file: /cvs/src/sbin/disklabel/disklabel.8,v
> diff -u -p -r1.156 disklabel.8
> --- sbin/disklabel/disklabel.8 5 Jul 2023 08:05:04 -0000 1.156
> +++ sbin/disklabel/disklabel.8 22 Mar 2024 15:10:08 -0000
> @@ -499,7 +499,7 @@ Ta 384MB \(en \0\01GB Ta Ta Ta
> .It Sy /usr/local \
> Ta \0\01GB \(en \020GB Ta Ta Ta
> .It Sy /usr/src \
> -Ta 1.5GB \(en \0\03GB Ta Ta Ta
> +Ta \0\02GB \(en \0\05GB Ta Ta Ta
> .It Sy /usr/obj \
> Ta \0\05GB \(en \0\06GB Ta Ta Ta
> .El
> Index: sbin/disklabel/editor.c
> ===================================================================
> RCS file: /cvs/src/sbin/disklabel/editor.c,v
> diff -u -p -r1.417 editor.c
> --- sbin/disklabel/editor.c 6 Sep 2023 12:45:19 -0000 1.417
> +++ sbin/disklabel/editor.c 21 Mar 2024 22:35:25 -0000
> @@ -97,7 +97,7 @@ struct space_allocation alloc_big[] = {
> { 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" },
> + { GIG(2), GIG(5), 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 */
> Index: regress/sbin/disklabel/12000.ok
> ===================================================================
> RCS file: /cvs/src/regress/sbin/disklabel/12000.ok,v
> diff -u -p -r1.7 12000.ok
> --- regress/sbin/disklabel/12000.ok 10 Dec 2021 13:17:09 -0000 1.7
> +++ regress/sbin/disklabel/12000.ok 22 Mar 2024 13:53:22 -0000
> @@ -2,25 +2,25 @@
> Writing MBR at offset 0.
>
> a: 0.2G 128 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: 2723360 21854688 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
>
> /dev/vnd0a / ffs rw 1 1
> /dev/vnd0k /home ffs rw 1 2
> Index: regress/sbin/disklabel/18000.ok
> ===================================================================
> RCS file: /cvs/src/regress/sbin/disklabel/18000.ok,v
> diff -u -p -r1.7 18000.ok
> --- regress/sbin/disklabel/18000.ok 10 Dec 2021 13:17:09 -0000 1.7
> +++ regress/sbin/disklabel/18000.ok 22 Mar 2024 13:48:14 -0000
> @@ -2,25 +2,25 @@
> Writing MBR at offset 0.
>
> a: 0.5G 128 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: 6409760 30456288 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
>
> /dev/vnd0a / ffs rw 1 1
> /dev/vnd0k /home ffs rw 1 2
> Index: regress/sbin/disklabel/20000.ok
> ===================================================================
> RCS file: /cvs/src/regress/sbin/disklabel/20000.ok,v
> diff -u -p -r1.7 20000.ok
> --- regress/sbin/disklabel/20000.ok 10 Dec 2021 13:17:09 -0000 1.7
> +++ regress/sbin/disklabel/20000.ok 22 Mar 2024 13:53:33 -0000
> @@ -2,25 +2,25 @@
> Writing MBR at offset 0.
>
> a: 0.6G 128 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: 7638560 33323488 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
>
> /dev/vnd0a / ffs rw 1 1
> /dev/vnd0k /home ffs rw 1 2
> Index: regress/sbin/disklabel/300000.ok
> ===================================================================
> RCS file: /cvs/src/regress/sbin/disklabel/300000.ok,v
> diff -u -p -r1.8 300000.ok
> --- regress/sbin/disklabel/300000.ok 25 Jun 2022 19:19:39 -0000 1.8
> +++ regress/sbin/disklabel/300000.ok 22 Mar 2024 13:54:01 -0000
> @@ -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: 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
> + 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
>
> /dev/vnd0a / ffs rw 1 1
> /dev/vnd0k /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.7 40000.ok
> --- regress/sbin/disklabel/40000.ok 10 Dec 2021 13:17:09 -0000 1.7
> +++ regress/sbin/disklabel/40000.ok 22 Mar 2024 13:53:50 -0000
> @@ -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: 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: 21860384 60061664 4.2BSD 2048 16384 1
> + 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
>
> /dev/vnd0a / ffs rw 1 1
> /dev/vnd0k /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.9 90000.ok
> --- regress/sbin/disklabel/90000.ok 25 Jun 2022 19:19:39 -0000 1.9
> +++ regress/sbin/disklabel/90000.ok 22 Mar 2024 13:53:01 -0000
> @@ -3,24 +3,24 @@ 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: 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: 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
> + 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
>
> /dev/vnd0a / ffs rw 1 1
> /dev/vnd0k /home ffs rw 1 2
> Index: regress/sbin/disklabel/900000.ok
> ===================================================================
> RCS file: /cvs/src/regress/sbin/disklabel/900000.ok,v
> diff -u -p -r1.7 900000.ok
> --- regress/sbin/disklabel/900000.ok 25 Jun 2022 19:19:39 -0000 1.7
> +++ regress/sbin/disklabel/900000.ok 22 Mar 2024 13:54:16 -0000
> @@ -15,12 +15,12 @@ Writing MBR at offset 0.
> 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
> + 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
>
> /dev/vnd0a / ffs rw 1 1
> /dev/vnd0k /home ffs rw 1 2
increase /usr/src partition