summaryrefslogtreecommitdiffstats
path: root/sysusers.d
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-06-29 22:26:19 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-29 22:27:07 +0200
commit94655a1670aef827eee6751c986da4bb4ecee6d4 (patch)
tree310fd4194f38348a124c1c33482462adaa8c908e /sysusers.d
parentutil: refuse considering UID 0xFFFF and 0xFFFFFFFF valid (diff)
downloadsystemd-94655a1670aef827eee6751c986da4bb4ecee6d4.tar.xz
systemd-94655a1670aef827eee6751c986da4bb4ecee6d4.zip
sysusers: split up default sysusers snippet
This ways, distributions have an easier way to replace the OS specific generic groups/users while keeping systemd's own.
Diffstat (limited to 'sysusers.d')
-rw-r--r--sysusers.d/.gitignore2
-rw-r--r--sysusers.d/basic.conf.in (renamed from sysusers.d/systemd.conf.in)8
-rw-r--r--sysusers.d/systemd.conf13
3 files changed, 14 insertions, 9 deletions
diff --git a/sysusers.d/.gitignore b/sysusers.d/.gitignore
index 9a4436c542..f7957a9889 100644
--- a/sysusers.d/.gitignore
+++ b/sysusers.d/.gitignore
@@ -1 +1 @@
-/systemd.conf
+/basic.conf
diff --git a/sysusers.d/systemd.conf.in b/sysusers.d/basic.conf.in
index bbdc261620..d463ce5bc2 100644
--- a/sysusers.d/systemd.conf.in
+++ b/sysusers.d/basic.conf.in
@@ -35,11 +35,3 @@ g video - -
# Default group for normal users
g users - -
-
-# Users and groups for specific systemd subsystems
-g systemd-journal - -
-u systemd-journal-gateway - "systemd Journal Gateway"
-u systemd-bus-proxy - "systemd Bus Proxy"
-u systemd-network - "systemd Network Management"
-u systemd-resolve - "systemd Resolver"
-u systemd-timesync - "systemd Time Synchronization"
diff --git a/sysusers.d/systemd.conf b/sysusers.d/systemd.conf
new file mode 100644
index 0000000000..139f010f5a
--- /dev/null
+++ b/sysusers.d/systemd.conf
@@ -0,0 +1,13 @@
+# 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.
+
+g systemd-journal - -
+u systemd-journal-gateway - "systemd Journal Gateway"
+u systemd-bus-proxy - "systemd Bus Proxy"
+u systemd-network - "systemd Network Management"
+u systemd-resolve - "systemd Resolver"
+u systemd-timesync - "systemd Time Synchronization"