dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-04 23:20:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

homework: sync dir after moving file in, not before

Browse Source
This commit is contained in:
Lennart Poettering
2021-11-04 23:29:12 +01:00
parent 1ca5a6c76e
commit bb562024a5
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/home/homework-luks.c
View File

@@ -2313,26 +2313,28 @@ int home_create_luks(
return log_error_errno(r, "Failed to synchronize image to disk: %m");
if (disk_uuid_path)
/* Reread partition table if this is a block device */
(void) ioctl(setup->image_fd, BLKRRPART, 0);
else {
assert(setup->temporary_image_path);
if (rename(setup->temporary_image_path, ip) < 0)
return log_error_errno(errno, "Failed to rename image file: %m");
setup->temporary_image_path = mfree(setup->temporary_image_path);
/* If we operate on a file, sync the containing directory too. */
r = fsync_directory_of_file(setup->image_fd);
if (r < 0)
return log_error_errno(r, "Failed to synchronize directory of image file to disk: %m");
log_info("Moved image file into place.");
}
/* Let's close the image fd now. If we are operating on a real block device this will release the BSD
* lock that ensures udev doesn't interfere with what we are doing */
setup->image_fd = safe_close(setup->image_fd);
if (setup->temporary_image_path) {
if (rename(setup->temporary_image_path, ip) < 0)
return log_error_errno(errno, "Failed to rename image file: %m");
setup->temporary_image_path = mfree(setup->temporary_image_path);
log_info("Moved image file into place.");
}
if (disk_uuid_path)
(void) wait_for_devlink(disk_uuid_path);