webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

installer: Make umounting more reliable

Browse Source
This commit is contained in:
Michael Tremer
2014-08-20 21:16:25 +02:00
parent ae5edf1612
commit ddd32a5cd3
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/installer/hw.c
View File

@@ -779,6 +779,9 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) {
} }
int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) { int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) {
// Write all buffers to disk before umounting
hw_sync();
// boot // boot
if (*dest->part_boot) { if (*dest->part_boot) {
hw_umount(dest->part_boot); hw_umount(dest->part_boot);

15
src/installer/main.c
View File

@@ -637,6 +637,13 @@ int main(int argc, char *argv[]) {
mysystem(logfile, commandstring); mysystem(logfile, commandstring);
} }
// Umount the destination drive
hw_umount_filesystems(destination, DESTINATION_MOUNT_PATH);
// Stop the RAID array if we are using RAID
if (destination->is_raid)
hw_stop_all_raid_arrays(logfile);
// Umount source drive and eject // Umount source drive and eject
hw_umount(SOURCE_MOUNT_PATH); hw_umount(SOURCE_MOUNT_PATH);
@@ -671,13 +678,7 @@ EXIT:
free(helpline); free(helpline);
free(sourcedrive); free(sourcedrive);
free(destination);
if (destination) {
hw_sync();
hw_umount_filesystems(destination, DESTINATION_MOUNT_PATH);
free(destination);
}
hw_stop_all_raid_arrays(logfile); hw_stop_all_raid_arrays(logfile);