summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMatthias Schiffer <matthias.schiffer@ew.tq-group.com>2019-05-03 16:27:33 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-05-09 16:31:06 +0100
commitae3c8d938c261c92ecf06e2d09f7e32bc117ceb8 (patch)
tree1ca86560142cd850bea588d72fa7e9bcf5871dcd /meta
parente107feab1734d5751ea0d94ca6dbccc059709b55 (diff)
downloadopenembedded-core-contrib-ae3c8d938c261c92ecf06e2d09f7e32bc117ceb8.tar.gz
openembedded-core-contrib-ae3c8d938c261c92ecf06e2d09f7e32bc117ceb8.tar.bz2
openembedded-core-contrib-ae3c8d938c261c92ecf06e2d09f7e32bc117ceb8.zip
systemd: move "machines" symlinks to systemd-container
Move symlinks to the machines.target and var-lib-machines.mount units to the systemd-container package, where the pointed at units are located as well. This avoids an implicit dependency of the systemd package on systemd-container, which prevented the use of systemd without installing systemd-container. Signed-off-by: Matthias Schiffer <matthias.schiffer@ew.tq-group.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-core/systemd/systemd_242.bb3
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-core/systemd/systemd_242.bb b/meta/recipes-core/systemd/systemd_242.bb
index c7ccd1f99b..73e03c7a77 100644
--- a/meta/recipes-core/systemd/systemd_242.bb
+++ b/meta/recipes-core/systemd/systemd_242.bb
@@ -403,12 +403,15 @@ SYSTEMD_SERVICE_${PN}-remote = "systemd-journal-remote.socket"
FILES_${PN}-container = "${sysconfdir}/dbus-1/system.d/org.freedesktop.import1.conf \
${sysconfdir}/dbus-1/system.d/org.freedesktop.machine1.conf \
+ ${sysconfdir}/systemd/system/multi-user.target.wants/machines.target \
${base_bindir}/machinectl \
${bindir}/systemd-nspawn \
${nonarch_libdir}/systemd/import-pubring.gpg \
${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.import1.busname \
${systemd_system_unitdir}/busnames.target.wants/org.freedesktop.machine1.busname \
${systemd_system_unitdir}/local-fs.target.wants/var-lib-machines.mount \
+ ${systemd_system_unitdir}/machines.target.wants/var-lib-machines.mount \
+ ${systemd_system_unitdir}/remote-fs.target.wants/var-lib-machines.mount \
${systemd_system_unitdir}/machine.slice \
${systemd_system_unitdir}/machines.target \
${systemd_system_unitdir}/org.freedesktop.import1.busname \