diff options
author | Jonas Bonn <jonas@norrbonn.se> | 2019-05-02 22:09:40 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-05-03 06:11:57 +0100 |
commit | 119d310f36bfaba25ad99266ad41f5abca748b43 (patch) | |
tree | 892e95b6fd3384fe2b4ef2fdfad0193c0f340c36 /meta/classes/rootfs-postcommands.bbclass | |
parent | 140c96d9653bcd6385d659d57645747ea521333d (diff) | |
download | poky-119d310f36bfaba25ad99266ad41f5abca748b43.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.
(From OE-Core rev: 76444b63e614baea33c044851a5859f6d1e69729)
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/classes/rootfs-postcommands.bbclass')
-rw-r--r-- | meta/classes/rootfs-postcommands.bbclass | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/meta/classes/rootfs-postcommands.bbclass b/meta/classes/rootfs-postcommands.bbclass index bde58ad6cd..89f8efd323 100644 --- a/meta/classes/rootfs-postcommands.bbclass +++ b/meta/classes/rootfs-postcommands.bbclass | |||
@@ -126,6 +126,12 @@ read_only_rootfs_hook () { | |||
126 | ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh | 126 | ${IMAGE_ROOTFS}/etc/init.d/populate-volatile.sh |
127 | fi | 127 | fi |
128 | fi | 128 | fi |
129 | |||
130 | if ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "true", "false", d)}; then | ||
131 | # Create machine-id | ||
132 | # 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 | ||
133 | touch ${IMAGE_ROOTFS}${sysconfdir}/machine-id | ||
134 | fi | ||
129 | } | 135 | } |
130 | 136 | ||
131 | # | 137 | # |