From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 18 Dec 2017 09:09:53 +0000 (+0000)
Subject: Tighten /usr/local and /usr/X11R6 so that 8G disks still fit in our default
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ecf06799e4c3670e6dff7a0b961d1114014a7cb8;p=openbsd

Tighten /usr/local and /usr/X11R6 so that 8G disks still fit in our default
partitioning scheme.

ok florian@ benno@
---

diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8
index 0a97f9b44da..18dc41b25ad 100644
--- a/sbin/disklabel/disklabel.8
+++ b/sbin/disklabel/disklabel.8
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: disklabel.8,v 1.123 2017/05/19 12:54:30 otto Exp $
+.\"	$OpenBSD: disklabel.8,v 1.124 2017/12/18 09:09:53 ajacoutot 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: May 19 2017 $
+.Dd $Mdocdate: December 18 2017 $
 .Dt DISKLABEL 8
 .Os
 .Sh NAME
@@ -517,16 +517,16 @@ and may vary from architecture to architecture.
 .Pp
 .Sy Disks \*(Ge 8 Gigabytes
 .Bd -literal -offset indent -compact
-/		 5% of disk. 120M \(en 1G
-swap		10% of disk.  80M \(en 2x max physical memory
-/tmp		 8% of disk. 120M \(en 4G
-/var		13% of disk.  80M \(en 2x size of crash dump
-/usr		 5% of disk. 900M \(en 2G
-/usr/X11R6	 3% of disk. 512M \(en 1G
-/usr/local	15% of disk. 1.2G \(en 10G
-/usr/src	 2% of disk.   1G \(en 2G
-/usr/obj	 4% of disk.   3G \(en 6G
-/home		35% of disk.   1G \(en 300G
+/		 5% of disk.  150M \(en 1G
+swap		10% of disk.   80M \(en 2x max physical memory
+/tmp		 8% of disk.  120M \(en 4G
+/var		13% of disk.   80M \(en 2x size of crash dump
+/usr		 5% of disk.  900M \(en 2G
+/usr/X11R6	 3% of disk.  384M \(en 1G
+/usr/local	15% of disk.    1G \(en 10G
+/usr/src	 2% of disk. 1300M \(en 2G
+/usr/obj	 4% of disk.    3G \(en 6G
+/home		35% of disk.    1G \(en 300G
 .Ed
 .Pp
 .Sy Disks \*(Gt 2 Gigabytes
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c
index 3a57e5ab2e2..f2dbef51418 100644
--- a/sbin/disklabel/editor.c
+++ b/sbin/disklabel/editor.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: editor.c,v 1.309 2017/11/28 01:54:25 benno Exp $	*/
+/*	$OpenBSD: editor.c,v 1.310 2017/12/18 09:09:53 ajacoutot Exp $	*/
 
 /*
  * Copyright (c) 1997-2000 Todd C. Miller <Todd.Miller@courtesan.com>
@@ -75,8 +75,8 @@ struct space_allocation alloc_big[] = {
 	{  MEG(120),         GIG(4),   8, "/tmp"	},
 	{   MEG(80),         GIG(4),  13, "/var"	},
 	{  MEG(900),         GIG(2),   5, "/usr"	},
-	{  MEG(512),         GIG(1),   3, "/usr/X11R6"	},
-	{ MEG(1200),        GIG(10),  15, "/usr/local"	},
+	{  MEG(384),         GIG(1),   3, "/usr/X11R6"	},
+	{    GIG(1),        GIG(10),  15, "/usr/local"	},
 	{ MEG(1300),         GIG(2),   2, "/usr/src"	},
 	{    GIG(3),         GIG(6),   4, "/usr/obj"	},
 	{    GIG(1),       GIG(300),  35, "/home"	}