From 94655a1670aef827eee6751c986da4bb4ecee6d4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Sun, 29 Jun 2014 22:26:19 +0200 Subject: 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. --- sysusers.d/.gitignore | 2 +- sysusers.d/basic.conf.in | 37 +++++++++++++++++++++++++++++++++++++ sysusers.d/systemd.conf | 13 +++++++++++++ sysusers.d/systemd.conf.in | 45 --------------------------------------------- 4 files changed, 51 insertions(+), 46 deletions(-) create mode 100644 sysusers.d/basic.conf.in create mode 100644 sysusers.d/systemd.conf delete mode 100644 sysusers.d/systemd.conf.in (limited to 'sysusers.d') 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/basic.conf.in b/sysusers.d/basic.conf.in new file mode 100644 index 0000000000..d463ce5bc2 --- /dev/null +++ b/sysusers.d/basic.conf.in @@ -0,0 +1,37 @@ +# 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. + +# The superuser +u root 0 "Super User" + +# The nobody user for NFS file systems +u nobody 65534 "Nobody" + +# Administrator group: can *see* more than normal users +g adm - - + +# Administrator group: can *do* more than normal users +g wheel - - + +# Access to certain kernel and userspace facilities +g kmem - - +g lock - - +g tty @TTY_GID@ - +g utmp - - + +# Hardware access groups +g audio - - +g cdrom - - +g dialout - - +g disk - - +g input - - +g lp - - +g tape - - +g video - - + +# Default group for normal users +g users - - 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" diff --git a/sysusers.d/systemd.conf.in b/sysusers.d/systemd.conf.in deleted file mode 100644 index bbdc261620..0000000000 --- a/sysusers.d/systemd.conf.in +++ /dev/null @@ -1,45 +0,0 @@ -# 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. - -# The superuser -u root 0 "Super User" - -# The nobody user for NFS file systems -u nobody 65534 "Nobody" - -# Administrator group: can *see* more than normal users -g adm - - - -# Administrator group: can *do* more than normal users -g wheel - - - -# Access to certain kernel and userspace facilities -g kmem - - -g lock - - -g tty @TTY_GID@ - -g utmp - - - -# Hardware access groups -g audio - - -g cdrom - - -g dialout - - -g disk - - -g input - - -g lp - - -g tape - - -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" -- cgit v1.2.3-54-g00ecf