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

installer: Fix access test after partitioning

Browse Source
This commit is contained in:
Michael Tremer
2014-08-21 16:43:07 +02:00
parent d1782bf02d
commit 0e491487e9
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/installer/hw.c
View File

@@ -526,6 +526,16 @@ static int hw_zero_out_device(const char* path, int bytes) {
return bytes_written; return bytes_written;
} }
static int try_open(const char* path) {
FILE* f = fopen(path, "r");
if (f) {
fclose(f);
return 0;
}
return -1;
}
int hw_create_partitions(struct hw_destination* dest, const char* output) { int hw_create_partitions(struct hw_destination* dest, const char* output) {
// Before we write a new partition table to the disk, we will erase // Before we write a new partition table to the disk, we will erase
// the first couple of megabytes at the beginning of the device to // the first couple of megabytes at the beginning of the device to
@@ -606,19 +616,19 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) {
while (counter-- > 0) { while (counter-- > 0) {
sleep(1); sleep(1);
if (*dest->part_bootldr && (access(dest->part_bootldr, R_OK) != 0)) if (*dest->part_bootldr && (try_open(dest->part_bootldr) != 0))
continue; continue;
if (*dest->part_boot && (access(dest->part_boot, R_OK) != 0)) if (*dest->part_boot && (try_open(dest->part_boot) != 0))
continue; continue;
if (*dest->part_swap && (access(dest->part_swap, R_OK) != 0)) if (*dest->part_swap && (try_open(dest->part_swap) != 0))
continue; continue;
if (*dest->part_root && (access(dest->part_root, R_OK) != 0)) if (*dest->part_root && (try_open(dest->part_root) != 0))
continue; continue;
if (*dest->part_data && (access(dest->part_data, R_OK) != 0)) if (*dest->part_data && (try_open(dest->part_data) != 0))
continue; continue;
// All partitions do exist, exiting the loop. // All partitions do exist, exiting the loop.
@@ -884,11 +894,8 @@ int hw_setup_raid(struct hw_destination* dest, const char* output) {
// If the raid device has not yet been properly brought up, // If the raid device has not yet been properly brought up,
// opening it will fail with the message: Device or resource busy // opening it will fail with the message: Device or resource busy
// Hence we will wait a bit until it becomes usable. // Hence we will wait a bit until it becomes usable.
FILE* f = fopen(dest->path, "r"); if (try_open(dest->path) == 0)
if (f) {
fclose(f);
break; break;
}
} }
} }