#include <assert.h>
#include <blkid/blkid.h>
+#include <errno.h>
#include <fcntl.h>
#include <libudev.h>
#include <linux/loop.h>
}
int hw_umount(const char* target) {
- return umount2(target, 0);
+ int r = umount2(target, 0);
+
+ if (r && errno == EBUSY) {
+ // Give it a moment to settle
+ sleep(1);
+
+ r = umount2(target, MNT_FORCE);
+ }
+
+ return r;
}
static int hw_test_source_medium(const char* path) {
// Umount the test device.
hw_umount(SOURCE_MOUNT_PATH);
- return (ret == 0);
+ return ret;
}
char* hw_find_source_medium(struct hw* hw) {
"%s - %s", size_str, p);
}
+ // Cut off the description string after 40 characters
+ disk->description[41] = '\0';
+
*disks++ = disk;
if (--i == 0)
// EXT4
} else if (fs == HW_FS_EXT4) {
- snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -T ext4 %s", path);
+ snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 %s", path);
// EXT4 w/o journal
} else if (fs == HW_FS_EXT4_WO_JOURNAL) {
- snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -T ext4 -O ^has_journal %s", path);
+ snprintf(cmd, sizeof(cmd), "/sbin/mke2fs -FF -T ext4 -O ^has_journal %s", path);
// XFS
} else if (fs == HW_FS_XFS) {
}
int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) {
+ int r;
+ char target[STRING_SIZE];
+
// Write all buffers to disk before umounting
hw_sync();
// boot
if (*dest->part_boot) {
- hw_umount(dest->part_boot);
+ snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_BOOT);
+ r = hw_umount(target);
+ if (r)
+ return -1;
}
// data
if (*dest->part_data) {
- hw_umount(dest->part_data);
+ snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_DATA);
+ r = hw_umount(target);
+ if (r)
+ return -1;
}
- // root
- hw_umount(dest->part_root);
-
// swap
if (*dest->part_swap) {
swapoff(dest->part_swap);
}
// misc filesystems
- char target[STRING_SIZE];
char** otherfs = other_filesystems;
-
while (*otherfs) {
snprintf(target, sizeof(target), "%s%s", prefix, *otherfs++);
- hw_umount(target);
+ r = hw_umount(target);
+ if (r)
+ return -1;
}
+ // root
+ r = hw_umount(prefix);
+ if (r)
+ return -1;
+
return 0;
}
r = system_chroot(output, DESTINATION_MOUNT_PATH, cmd);
}
+ hw_sync();
+
return r;
}