diff options
author | Dan McGregor <dan.mcgregor@usask.ca> | 2015-11-03 16:54:35 -0600 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:08:10 +0000 |
commit | ac347849e7eeda257afea27fee211bf4c9e42149 (patch) | |
tree | 96c8ca9c41a51736a0013649923200fca0ac76af /meta/recipes-core | |
parent | 04937cca7fb1cc88e914685ab839a8e313b20f01 (diff) | |
download | poky-ac347849e7eeda257afea27fee211bf4c9e42149.tar.gz |
systemd: add machine-id to conffiles
If / is mounted read-write machine-id will be overwritten on first boot.
This change ensures that the machine-id file persists across package
upgrades to systemd.
(From OE-Core rev: a25335967ac4aa62d77e862b4b80fed293eba0ad)
Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/systemd/systemd_225.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd_225.bb b/meta/recipes-core/systemd/systemd_225.bb index 0b54ac86f9..6393ca0fef 100644 --- a/meta/recipes-core/systemd/systemd_225.bb +++ b/meta/recipes-core/systemd/systemd_225.bb | |||
@@ -270,7 +270,8 @@ RRECOMMENDS_${PN}-binfmt = "kernel-module-binfmt-misc" | |||
270 | 270 | ||
271 | RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" | 271 | RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps" |
272 | 272 | ||
273 | CONFFILES_${PN} = "${sysconfdir}/systemd/journald.conf \ | 273 | CONFFILES_${PN} = "${sysconfdir}/machine-id \ |
274 | ${sysconfdir}/systemd/journald.conf \ | ||
274 | ${sysconfdir}/systemd/logind.conf \ | 275 | ${sysconfdir}/systemd/logind.conf \ |
275 | ${sysconfdir}/systemd/system.conf \ | 276 | ${sysconfdir}/systemd/system.conf \ |
276 | ${sysconfdir}/systemd/user.conf" | 277 | ${sysconfdir}/systemd/user.conf" |