aboutsummaryrefslogtreecommitdiffstats
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-07-19 10:54:10 +0100
commit1776ab75b8e5f00e69b99565af4cfeef27bc95d4 (patch)
tree51808026cae97a9433d4509714943f9f2081c4fa
parente92ee196e6d305bc443567241c6d07e79e74a2eb (diff)
downloadopenembedded-core-contrib-1776ab75b8e5f00e69b99565af4cfeef27bc95d4.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> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta/recipes-core/systemd/systemd_234.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_234.bb b/meta/recipes-core/systemd/systemd_234.bb
index 9ce27bf67a..6c248e8828 100644
--- a/meta/recipes-core/systemd/systemd_234.bb
+++ b/meta/recipes-core/systemd/systemd_234.bb
@@ -344,7 +344,7 @@ USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'networkd', '--sys
USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'coredump', '--system -d / -M --shell /bin/nologin systemd-coredump;', '', d)}"
USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'resolved', '--system -d / -M --shell /bin/nologin systemd-resolve;', '', d)}"
USERADD_PARAM_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'polkit', '--system --no-create-home --user-group --home-dir ${sysconfdir}/polkit-1 polkitd;', '', d)}"
-GROUPADD_PARAM_${PN} = "-r lock; -r systemd-journal"
+GROUPADD_PARAM_${PN} = "-r systemd-journal"
USERADD_PARAM_${PN}-extra-utils += "--system -d / -M --shell /bin/nologin systemd-bus-proxy;"
FILES_${PN}-analyze = "${bindir}/systemd-analyze"