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.

diff --git a/Makefile.am b/Makefile.am
index 5d86f3eaec3654dbf6d90c9788913cd2f9f7b64d..bb85b2cd228774cdaca3e8ff0a4aad8ecc2d7080 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1846,15 +1846,18 @@ nodist_systemunit_DATA += \
 SYSINIT_TARGET_WANTS += \
        systemd-sysusers.service
 
-nodist_sysusers_DATA = \
+dist_sysusers_DATA = \
        sysusers.d/systemd.conf
 
+nodist_sysusers_DATA = \
+       sysusers.d/basic.conf
+
 EXTRA_DIST += \
        units/systemd-sysusers.service.in \
-       sysusers.d/systemd.conf.in
+       sysusers.d/basic.conf.in
 
 CLEANFILES += \
-       sysusers.d/systemd.conf
+       sysusers.d/basic.conf
 
 INSTALL_DIRS += \
        $(sysusersdir)

diff --git a/sysusers.d/.gitignore b/sysusers.d/.gitignore
index 9a4436c5428018c0d630f1225c5ffc680f9691d7..f7957a9889dfb2d27cd792f53044312af544a829 100644 (file)
--- 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
similarity index 75%
rename from sysusers.d/systemd.conf.in
rename to sysusers.d/basic.conf.in
index bbdc261620d821b90a4593e2ed093cbc0340473c..d463ce5bc265f3d6fecf2e20154757d69291993b 100644 (file)
--- 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 (file)
index 0000000..139f010
--- /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"