From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 19 May 2019 13:55:35 +0000 (+0900)
Subject: sysctl: bump pid range only on 64-bit systems
X-Git-Tag: v243-rc1~405
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e0d424c0f5e1b8cff32ed51033ee6e2f70a5676;p=thirdparty%2Fsystemd.git

sysctl: bump pid range only on 64-bit systems

Closes #12604.
---

diff --git a/sysctl.d/50-default.conf b/sysctl.d/50-default.conf
index ace2302589f..27084f62424 100644
--- a/sysctl.d/50-default.conf
+++ b/sysctl.d/50-default.conf
@@ -40,7 +40,3 @@ fs.protected_symlinks = 1
 # Enable regular file and FIFO protection
 fs.protected_regular = 1
 fs.protected_fifos = 1
-
-# Bump the numeric PID range to its maximum of 2^22 (from the in-kernel default
-# of 2^16), to make PID collisions less likely.
-kernel.pid_max = 4194304
diff --git a/sysctl.d/50-pid-max.conf b/sysctl.d/50-pid-max.conf
new file mode 100644
index 00000000000..1eff2d7ecee
--- /dev/null
+++ b/sysctl.d/50-pid-max.conf
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+# See sysctl.d(5) and core(5) for documentation.
+
+# To override settings in this file, create a local file in /etc
+# (e.g. /etc/sysctl.d/90-override.conf), and put any assignments
+# there.
+
+# Bump the numeric PID range to its maximum of 2^22 (from the in-kernel default
+# of 2^16), to make PID collisions less likely.
+kernel.pid_max = 4194304
diff --git a/sysctl.d/meson.build b/sysctl.d/meson.build
index 64f6ce942ed..3f072e3db77 100644
--- a/sysctl.d/meson.build
+++ b/sysctl.d/meson.build
@@ -6,6 +6,13 @@ install_data(
 
 in_files = []
 
+# Kernel determines PID_MAX_LIMIT by
+# #define PID_MAX_LIMIT (CONFIG_BASE_SMALL ? PAGE_SIZE * 8 : \
+#         (sizeof(long) > 4 ? 4 * 1024 * 1024 : PID_MAX_DEFAULT))
+if cc.sizeof('long') > 4
+        install_data('50-pid-max.conf', install_dir : sysctldir)
+endif
+
 if conf.get('ENABLE_COREDUMP') == 1
         in_files += ['50-coredump.conf']
 endif