summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHannu Lounento <hannu.lounento@vaisala.com>2018-05-25 06:50:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-27 13:55:21 +0100
commit8c81752681ca3c76c34b0544b4f5b8c794f6ef34 (patch)
treed4362f1b019c2951d4df760682b1b4cbf6a47b9b
parenteb45228a003ba003cc62c31f170179f4ff4d474a (diff)
downloadpoky-8c81752681ca3c76c34b0544b4f5b8c794f6ef34.tar.gz
systemd: remove the group 'lock'
The upstream commit 61f32bff6130a44d077886d38cff89ad161bf177 included in the release v229 removed the use of the group: commit 61f32bff6130a44d077886d38cff89ad161bf177 Author: Martin Pitt <martin.pitt@ubuntu.com> Date: Mon Feb 1 12:09:34 2016 +0100 tmpfiles: drop /run/lock/lockdev Hardly any software uses that any more, and better locking mechanisms like flock() have been available for many years. Also drop the corresponding "lock" group from sysusers.d/basic.conf.in, as nothing else is using this. [...] diff --git a/sysusers.d/basic.conf.in b/sysusers.d/basic.conf.in index 823d6cb20..b2dc5ebd4 100644 --- a/sysusers.d/basic.conf.in +++ b/sysusers.d/basic.conf.in @@ -19,7 +19,6 @@ g wheel - - - # Access to certain kernel and userspace facilities g kmem - - - -g lock - - - g tty @TTY_GID@ - - g utmp - - - [...] The upstream documentation doc/UIDS-GIDS.md says that basic.conf.in is "the precise list of the currently defined groups": ## Special `systemd` GIDs `systemd` defines no special UIDs beyond what Linux already defines (see above). However, it does define some special group/GID assignments, which are primarily used for `systemd-udevd`'s device management. The precise list of the currently defined groups is found in this `sysusers.d` snippet: [basic.conf](https://raw.githubusercontent.com/systemd/systemd/master/sysusers.d/basic.conf.in) It's strongly recommended that downstream distributions include these groups in their default group databases. Removing the creation of the group also avoids the need to define a GID for it when using static ids. (From OE-Core rev: da3659155cd1825a4a8d3d7c5288b4273714de15) Signed-off-by: Hannu Lounento <hannu.lounento@vaisala.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/systemd/systemd_237.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_237.bb b/meta/recipes-core/systemd/systemd_237.bb
index e4846fe4f6..3efca33e73 100644
--- a/meta/recipes-core/systemd/systemd_237.bb
+++ b/meta/recipes-core/systemd/systemd_237.bb
@@ -314,7 +314,7 @@ USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--sys
314USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}" 314USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}"
315USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}" 315USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}"
316USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}" 316USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}"
317GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal" 317GROUPADD_PARAM_${PN} = "-r systemd-journal"
318USERADD_PARAM_${PN}-extra-utils += "--system -d / -M --shell /bin/nologin systemd-bus-proxy;" 318USERADD_PARAM_${PN}-extra-utils += "--system -d / -M --shell /bin/nologin systemd-bus-proxy;"
319 319
320FILES_${PN}-analyze = "${bindir}/systemd-analyze" 320FILES_${PN}-analyze = "${bindir}/systemd-analyze"