diff options
author | Jonas Bonn <jonas@norrbonn.se> | 2019-05-02 22:09:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-02 22:20:24 +0100 |
commit | 76444b63e614baea33c044851a5859f6d1e69729 (patch) | |
tree | 0bf2c7d88377550271ef629bb49e7225b4638fa1 /meta/recipes-core/systemd/systemd-conf_242.bb | |
parent | 6f0072d34107f4d351c79b43ce71bf4489428a34 (diff) | |
download | openembedded-core-contrib-76444b63e614baea33c044851a5859f6d1e69729.tar.gz |
systemd: do not create machine-id
There is no reason to have an emtpy machine-id as part of the systemd
package. Either:
i) the filesystem is writable and the file will be created
automatically; or
ii) the filesystem is read-only, in which case the empty machine-id file
should be created as part of the read-only-rootfs tweaks.
Signed-off-by: Jonas Bonn <jonas@norrbonn.se>
Signed-off-by: Alex Kiernan <alex.kiernan@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd-conf_242.bb')
-rw-r--r-- | meta/recipes-core/systemd/systemd-conf_242.bb | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/meta/recipes-core/systemd/systemd-conf_242.bb b/meta/recipes-core/systemd/systemd-conf_242.bb index 9bb27fd96d..7fe2e1105b 100644 --- a/meta/recipes-core/systemd/systemd-conf_242.bb +++ b/meta/recipes-core/systemd/systemd-conf_242.bb @@ -7,14 +7,13 @@ DefaultTimeoutStartSec setting." PACKAGE_ARCH = "${MACHINE_ARCH}" -CONFFILES_${PN} = "${sysconfdir}/machine-id \ -${sysconfdir}/systemd/coredump.conf \ +CONFFILES_${PN} = "${sysconfdir}/systemd/coredump.conf \ ${sysconfdir}/systemd/journald.conf \ ${sysconfdir}/systemd/logind.conf \ ${sysconfdir}/systemd/system.conf \ ${sysconfdir}/systemd/user.conf" -FILES_${PN} = "${sysconfdir}/machine-id ${sysconfdir}/systemd" +FILES_${PN} = "${sysconfdir}/systemd" do_configure[noexec] = '1' do_compile[noexec] = '1' @@ -23,10 +22,6 @@ do_install() { rm -rf ${D}/${sysconfdir}/systemd install -d ${D}/${sysconfdir}/systemd - # Create machine-id - # 20:12 < mezcalero> koen: you have three options: a) run systemd-machine-id-setup at install time, b) have / read-only and an empty file there (for stateless) and c) boot with / writable - touch ${D}${sysconfdir}/machine-id - install -m 0644 ${S}/src/coredump/coredump.conf ${D}${sysconfdir}/systemd/coredump.conf install -m 0644 ${S}/src/journal/journald.conf ${D}${sysconfdir}/systemd/journald.conf |