summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-31 09:45:05 +0200
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2014-07-31 14:56:03 +0200
commita4892054059c483a695e4250713b5ed8948a1c2f (patch)
tree4b32d4c1dc8d6dc8f00164fcef5c4fa53a686402
parentsystemd-analyze verify: improve error message (diff)
downloadsystemd-a4892054059c483a695e4250713b5ed8948a1c2f.tar.xz
systemd-a4892054059c483a695e4250713b5ed8948a1c2f.zip
sysusers: split users for remote into separate file
This mirrors the setup for tmpfiles.d done in ad95fd1d2b9.
-rw-r--r--Makefile.am3
-rw-r--r--sysusers.d/systemd-remote.conf10
-rw-r--r--sysusers.d/systemd.conf2
3 files changed, 12 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index bc16ce315b..2e982f5067 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1936,7 +1936,8 @@ SYSINIT_TARGET_WANTS += \
systemd-sysusers.service
dist_sysusers_DATA = \
- sysusers.d/systemd.conf
+ sysusers.d/systemd.conf \
+ sysusers.d/systemd-remote.conf
nodist_sysusers_DATA = \
sysusers.d/basic.conf
diff --git a/sysusers.d/systemd-remote.conf b/sysusers.d/systemd-remote.conf
new file mode 100644
index 0000000000..c03b862698
--- /dev/null
+++ b/sysusers.d/systemd-remote.conf
@@ -0,0 +1,10 @@
+# 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.
+
+u systemd-journal-gateway - "systemd Journal Gateway"
+u systemd-journal-remote - "systemd Journal Remote"
+u systemd-journal-upload - "systemd Journal Upload"
diff --git a/sysusers.d/systemd.conf b/sysusers.d/systemd.conf
index 4c4bd4a209..2dd427411f 100644
--- a/sysusers.d/systemd.conf
+++ b/sysusers.d/systemd.conf
@@ -6,8 +6,6 @@
# (at your option) any later version.
g systemd-journal - -
-u systemd-journal-gateway - "systemd Journal Gateway"
-u systemd-journal-remote - "systemd Journal Remote"
u systemd-bus-proxy - "systemd Bus Proxy"
u systemd-network - "systemd Network Management"
u systemd-resolve - "systemd Resolver"