summaryrefslogtreecommitdiff
path: root/sysusers.d
diff options
context:
space:
mode:
Diffstat (limited to 'sysusers.d')
-rw-r--r--sysusers.d/.gitignore1
-rw-r--r--sysusers.d/basic.conf.in1
-rw-r--r--sysusers.d/systemd-remote.conf.m4 (renamed from sysusers.d/systemd-remote.conf)4
-rw-r--r--sysusers.d/systemd.conf.m44
4 files changed, 8 insertions, 2 deletions
diff --git a/sysusers.d/.gitignore b/sysusers.d/.gitignore
index bb3aaaf821..c065034d29 100644
--- a/sysusers.d/.gitignore
+++ b/sysusers.d/.gitignore
@@ -1,2 +1,3 @@
/basic.conf
/systemd.conf
+/systemd-remote.conf
diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in
index 823d6cb200..b2dc5ebd4f 100644
--- a/sysusers.d/basic.conf.in
+++ b/sysusers.d/basic.conf.in
@@ -19,7 +19,6 @@ g wheel - - -
# Access to certain kernel and userspace facilities
g kmem - - -
-g lock - - -
g tty @TTY_GID@ - -
g utmp - - -
diff --git a/sysusers.d/systemd-remote.conf b/sysusers.d/systemd-remote.conf.m4
index 15969e9a97..0e9d71cdd0 100644
--- a/sysusers.d/systemd-remote.conf
+++ b/sysusers.d/systemd-remote.conf.m4
@@ -5,6 +5,10 @@
# the Free Software Foundation; either version 2.1 of the License, or
# (at your option) any later version.
+m4_ifdef(`HAVE_MICROHTTPD',
u systemd-journal-gateway - "systemd Journal Gateway"
u systemd-journal-remote - "systemd Journal Remote"
+)m4_dnl
+m4_ifdef(`HAVE_LIBCURL',
u systemd-journal-upload - "systemd Journal Upload"
+)m4_dnl
diff --git a/sysusers.d/systemd.conf.m4 b/sysusers.d/systemd.conf.m4
index 81b1d79c37..af97509c05 100644
--- a/sysusers.d/systemd.conf.m4
+++ b/sysusers.d/systemd.conf.m4
@@ -6,7 +6,6 @@
# (at your option) any later version.
g systemd-journal - -
-u systemd-bus-proxy - "systemd Bus Proxy"
m4_ifdef(`ENABLE_NETWORKD',
u systemd-network - "systemd Network Management"
)m4_dnl
@@ -16,3 +15,6 @@ u systemd-resolve - "systemd Resolver"
m4_ifdef(`ENABLE_TIMESYNCD',
u systemd-timesync - "systemd Time Synchronization"
)m4_dnl
+m4_ifdef(`ENABLE_COREDUMP',
+u systemd-coredump - "systemd Core Dumper"
+)m4_dnl