From: robert <robert@openbsd.org>
Date: Mon, 21 Feb 2022 06:38:57 +0000 (+0000)
Subject: cap the daemon login class' datasize at either 1G or 4G depending on
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e9a172dfb52d6b5b013a7d6cf484b0b941f0d10a;p=openbsd

cap the daemon login class' datasize at either 1G or 4G depending on
the architecture and set the bgpd class' datasize to either 16G or 1G

ok sthen@ and discussed with many
---

diff --git a/etc/etc.alpha/login.conf b/etc/etc.alpha/login.conf
index a05581284cd..286c2d23001 100644
--- a/etc/etc.alpha/login.conf
+++ b/etc/etc.alpha/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.11 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.12 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=1024M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=1024M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.amd64/login.conf b/etc/etc.amd64/login.conf
index 6dcadd06206..bf289744afc 100644
--- a/etc/etc.amd64/login.conf
+++ b/etc/etc.amd64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.21 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.22 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=4096M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -102,6 +102,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=16384M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.arm64/login.conf b/etc/etc.arm64/login.conf
index 1b7ea299369..495190ba921 100644
--- a/etc/etc.arm64/login.conf
+++ b/etc/etc.arm64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.12 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.13 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=4096M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=16384M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.armv7/login.conf b/etc/etc.armv7/login.conf
index 29066c4fb96..87a9d50e29d 100644
--- a/etc/etc.armv7/login.conf
+++ b/etc/etc.armv7/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.12 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.13 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=1024M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=1024M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.hppa/login.conf b/etc/etc.hppa/login.conf
index 2e09c5ea729..d337c2e6154 100644
--- a/etc/etc.hppa/login.conf
+++ b/etc/etc.hppa/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.13 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.14 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=1024M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=1024M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.i386/login.conf b/etc/etc.i386/login.conf
index 114a401000b..ea0b3401bd0 100644
--- a/etc/etc.i386/login.conf
+++ b/etc/etc.i386/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.15 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.16 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=1024M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -102,6 +102,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=1024M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.landisk/login.conf b/etc/etc.landisk/login.conf
index a05581284cd..286c2d23001 100644
--- a/etc/etc.landisk/login.conf
+++ b/etc/etc.landisk/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.11 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.12 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=1024M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=1024M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.loongson/login.conf b/etc/etc.loongson/login.conf
index 5396087e95b..a4c6673f336 100644
--- a/etc/etc.loongson/login.conf
+++ b/etc/etc.loongson/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.16 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.17 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=1024M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=1024M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.luna88k/login.conf b/etc/etc.luna88k/login.conf
index a05581284cd..286c2d23001 100644
--- a/etc/etc.luna88k/login.conf
+++ b/etc/etc.luna88k/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.11 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.12 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=1024M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=1024M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.macppc/login.conf b/etc/etc.macppc/login.conf
index fa8e58fcfb7..7bbc5e1d965 100644
--- a/etc/etc.macppc/login.conf
+++ b/etc/etc.macppc/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.17 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.18 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=1024M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -102,6 +102,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=1024M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.octeon/login.conf b/etc/etc.octeon/login.conf
index 800ef6f7049..bd003c674e7 100644
--- a/etc/etc.octeon/login.conf
+++ b/etc/etc.octeon/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.14 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.15 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=4096M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=16384M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.powerpc64/login.conf b/etc/etc.powerpc64/login.conf
index 4811f6248f9..e6e3c320111 100644
--- a/etc/etc.powerpc64/login.conf
+++ b/etc/etc.powerpc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.5 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.6 2022/02/21 06:38:57 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=4096M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -102,6 +102,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=16384M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.riscv64/login.conf b/etc/etc.riscv64/login.conf
index f1f6ec5f001..95aa32ccb35 100644
--- a/etc/etc.riscv64/login.conf
+++ b/etc/etc.riscv64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.3 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.4 2022/02/21 06:38:58 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=4096M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -103,6 +103,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=16384M:\
 	:openfiles=512:\
 	:tc=daemon:
 
diff --git a/etc/etc.sparc64/login.conf b/etc/etc.sparc64/login.conf
index 76efe7716f7..387cf322b31 100644
--- a/etc/etc.sparc64/login.conf
+++ b/etc/etc.sparc64/login.conf
@@ -1,4 +1,4 @@
-# $OpenBSD: login.conf,v 1.18 2022/01/04 13:43:14 jmc Exp $
+# $OpenBSD: login.conf,v 1.19 2022/02/21 06:38:58 robert Exp $
 
 #
 # Sample login.conf file.  See login.conf(5) for details.
@@ -59,7 +59,7 @@ default:\
 #
 daemon:\
 	:ignorenologin:\
-	:datasize=infinity:\
+	:datasize=4096M:\
 	:maxproc=infinity:\
 	:openfiles-max=1024:\
 	:openfiles-cur=128:\
@@ -102,6 +102,7 @@ pbuild:\
 # Override resource limits for certain daemons started by rc.d(8)
 #
 bgpd:\
+	:datasize=16384M:\
 	:openfiles=512:\
 	:tc=daemon: