summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2015-11-03 16:54:35 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-25 08:01:32 +0000
commita25335967ac4aa62d77e862b4b80fed293eba0ad (patch)
tree2f8e71720dbfcd9857d55a184f697be2ab3b5625
parent2c10bc96257a934d9431bef0c39006c7e100924d (diff)
downloadopenembedded-core-contrib-a25335967ac4aa62d77e862b4b80fed293eba0ad.tar.gz
openembedded-core-contrib-a25335967ac4aa62d77e862b4b80fed293eba0ad.tar.bz2
openembedded-core-contrib-a25335967ac4aa62d77e862b4b80fed293eba0ad.zip
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. Signed-off-by: Dan McGregor <dan.mcgregor@usask.ca> Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/recipes-core/systemd/systemd_225.bb3
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"
RRECOMMENDS_${PN}-vconsole-setup = "kbd kbd-consolefonts kbd-keymaps"
-CONFFILES_${PN} = "${sysconfdir}/systemd/journald.conf \
+CONFFILES_${PN} = "${sysconfdir}/machine-id \
+ ${sysconfdir}/systemd/journald.conf \
${sysconfdir}/systemd/logind.conf \
${sysconfdir}/systemd/system.conf \
${sysconfdir}/systemd/user.conf"