diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2023-03-15 18:11:04 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-03-16 17:49:38 +0000 |
commit | 6e071e029206d82e90b121c9b110168433574187 (patch) | |
tree | 71c8ddef95adbaf339c58c7ee225b26a402975ec /meta/recipes-core/systemd/systemd-systemctl | |
parent | 0b937af08cc172589083fdae41f1c301059010c9 (diff) | |
download | poky-6e071e029206d82e90b121c9b110168433574187.tar.gz |
Revert "systemd-systemctl: Create machine-id with "uninitialized" text in it"
This reverts commit 33d9b3a8ed186c2d212acb83f715367912010e7f.
The reverted patch was forcing systemd to do preset-all at boot time (first boot)
in a function that simuilates 'preset-all' at rootfs time. This is not right.
To force a first boot, just do not run this function, as said in the comment:
"""
# If we populate the systemd links we also create /etc/machine-id, which
# allows systemd to boot with the filesystem read-only before generating
# a real value and then committing it back.
#
# For the stateless configuration, where /etc is generated at runtime
# (for example on a tmpfs), this script shouldn't run at all and we
# allow systemd to completely populate /etc.
"""
For example, removing 'systemd_preset_all;' from IMAGE_PREPROCESS_COMMAND in some
distro conf file will achieve the same effect of the original patch.
(From OE-Core rev: a2ac09c32acfc2e076a7778447919d97553d38a2)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/systemd/systemd-systemctl')
-rwxr-xr-x | meta/recipes-core/systemd/systemd-systemctl/systemctl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/recipes-core/systemd/systemd-systemctl/systemctl b/meta/recipes-core/systemd/systemd-systemctl/systemctl index 45b29671ee..cddae75a06 100755 --- a/meta/recipes-core/systemd/systemd-systemctl/systemctl +++ b/meta/recipes-core/systemd/systemd-systemctl/systemctl | |||
@@ -302,7 +302,7 @@ def preset_all(root): | |||
302 | # For the stateless configuration, where /etc is generated at runtime | 302 | # For the stateless configuration, where /etc is generated at runtime |
303 | # (for example on a tmpfs), this script shouldn't run at all and we | 303 | # (for example on a tmpfs), this script shouldn't run at all and we |
304 | # allow systemd to completely populate /etc. | 304 | # allow systemd to completely populate /etc. |
305 | (root / SYSCONFDIR / "machine-id").write_text("uninitialized") | 305 | (root / SYSCONFDIR / "machine-id").touch() |
306 | 306 | ||
307 | 307 | ||
308 | def main(): | 308 | def main(): |