diff options
| -rw-r--r-- | src/core/machine-id-setup.c | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/core/machine-id-setup.c b/src/core/machine-id-setup.c index 4e9a8d266e..c55e0b5321 100644 --- a/src/core/machine-id-setup.c +++ b/src/core/machine-id-setup.c @@ -202,10 +202,22 @@ finish: int machine_id_commit(const char *root) { _cleanup_close_ int fd = -1, initial_mntns_fd = -1; - const char *etc_machine_id; + const char *etc_machine_id, *sync_path; sd_id128_t id; int r; + /* Before doing anything, sync everything to ensure any changes by first-boot units are persisted. + * + * First, explicitly sync the file systems we care about and check if it worked. */ + FOREACH_STRING(sync_path, "/etc/", "/var/") { + r = syncfs_path(AT_FDCWD, sync_path); + if (r < 0) + return log_error_errno(r, "Cannot sync %s: %m", sync_path); + } + + /* Afterwards, sync() the rest too, but we can't check the return value for these. */ + sync(); + /* Replaces a tmpfs bind mount of /etc/machine-id by a proper file, atomically. For this, the umount is removed * in a mount namespace, a new file is created at the right place. Afterwards the mount is also removed in the * original mount namespace, thus revealing the file that was just created. */ |