Merge pull request #23203 from yuwata/login-runtime

login: make RuntimeDirectoryInodesMax= support K, G, M suffixes
core: drop non-default value for DefaultLimitMEMLOCK=
2026-04-26 00:45:09 +02:00 · 2022-04-29 17:10:34 +02:00 · 2022-04-29 21:15:55 +09:00 · 2022-04-29 21:15:21 +09:00 · 2022-04-29 21:08:15 +09:00
3 changed files with 3 additions and 3 deletions
--- a/src/core/system.conf.in
+++ b/src/core/system.conf.in
@ -66,7 +66,7 @@
 #DefaultLimitNOFILE=1024:{{HIGH_RLIMIT_NOFILE}}
 #DefaultLimitAS=
 #DefaultLimitNPROC=
-#DefaultLimitMEMLOCK=8M
+#DefaultLimitMEMLOCK=
 #DefaultLimitLOCKS=
 #DefaultLimitSIGPENDING=
 #DefaultLimitMSGQUEUE=
--- a/src/login/logind-gperf.gperf
+++ b/src/login/logind-gperf.gperf
@ -45,7 +45,7 @@ Login.HoldoffTimeoutSec,            config_parse_sec,                   0, offse
 Login.IdleAction,                   config_parse_handle_action,         0, offsetof(Manager, idle_action)
 Login.IdleActionSec,                config_parse_sec,                   0, offsetof(Manager, idle_action_usec)
 Login.RuntimeDirectorySize,         config_parse_tmpfs_size,            0, offsetof(Manager, runtime_dir_size)
-Login.RuntimeDirectoryInodesMax,    config_parse_uint64,                0, offsetof(Manager, runtime_dir_inodes)
+Login.RuntimeDirectoryInodesMax,    config_parse_iec_uint64,            0, offsetof(Manager, runtime_dir_inodes)
 Login.RemoveIPC,                    config_parse_bool,                  0, offsetof(Manager, remove_ipc)
 Login.InhibitorsMax,                config_parse_uint64,                0, offsetof(Manager, inhibitors_max)
 Login.SessionsMax,                  config_parse_uint64,                0, offsetof(Manager, sessions_max)
--- a/src/login/logind.conf.in
+++ b/src/login/logind.conf.in
@ -42,7 +42,7 @@
 #IdleAction=ignore
 #IdleActionSec=30min
 #RuntimeDirectorySize=10%
-#RuntimeDirectoryInodesMax=400k
+#RuntimeDirectoryInodesMax=
 #RemoveIPC=yes
 #InhibitorsMax=8192
 #SessionsMax=8192
Author	SHA1	Message	Date
Lennart Poettering	6e81415944	Merge pull request #23203 from yuwata/login-runtime login: make RuntimeDirectoryInodesMax= support K, G, M suffixes	2022-04-29 17:10:34 +02:00
Yu Watanabe	606104bcdb	core: drop non-default value for DefaultLimitMEMLOCK=	2022-04-29 21:15:55 +09:00
Yu Watanabe	0bc055cf52	login: drop non-default value for RuntimeDirectoryInodesMax=	2022-04-29 21:15:21 +09:00
Yu Watanabe	08a767f1e0	login: make RuntimeDirectoryInodesMax= support K, G, M suffixes Fixes #23017.	2022-04-29 21:08:15 +09:00