summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan McGregor <dan.mcgregor@usask.ca>2015-10-20 10:59:15 -0600
committerDan McGregor <dan.mcgregor@usask.ca>2015-11-16 10:54:15 -0600
commitea4c5b6922497ed7aa516fd2609f4e47066ee85c (patch)
tree0dd8bd4eec151e9fe6ac74a2130b0409d3059bac
parentf4cfc62158de1bee2d1af9daafcddbce0cc439e5 (diff)
downloadopenembedded-core-contrib-ea4c5b6922497ed7aa516fd2609f4e47066ee85c.tar.gz
openembedded-core-contrib-ea4c5b6922497ed7aa516fd2609f4e47066ee85c.tar.bz2
openembedded-core-contrib-ea4c5b6922497ed7aa516fd2609f4e47066ee85c.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>
-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"