diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rw-r--r-- | sysusers.d/.gitignore | 2 | ||||
| -rw-r--r-- | sysusers.d/basic.conf.in (renamed from sysusers.d/systemd.conf.in) | 8 | ||||
| -rw-r--r-- | sysusers.d/systemd.conf | 13 |
4 files changed, 20 insertions, 12 deletions
diff --git a/Makefile.am b/Makefile.am index 5d86f3eaec..bb85b2cd22 100644 --- 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 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" |