diff options
| author | Poul-Henning Kamp <phk@FreeBSD.org> | 2002-10-22 10:52:53 +0000 |
|---|---|---|
| committer | Poul-Henning Kamp <phk@FreeBSD.org> | 2002-10-22 10:52:53 +0000 |
| commit | ef4d89ea4013a28fc0d65dfb6ecaabe632d587d9 (patch) | |
| tree | f73e34b0072287d857d29f148330f5f309b3395b /usr.sbin | |
| parent | 1e08b0a6376efef74dbc8975e4c6cf9267d0ecf6 (diff) | |
| download | src-ef4d89ea4013a28fc0d65dfb6ecaabe632d587d9.tar.gz src-ef4d89ea4013a28fc0d65dfb6ecaabe632d587d9.zip | |
Chunk functions in libdisk take an extra arguement for all archs to accomodate
PC98 with less ifdef madness.
Notes
Notes:
svn path=/head/; revision=105686
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/sade/disks.c | 13 | ||||
| -rw-r--r-- | usr.sbin/sade/wizard.c | 2 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/disks.c | 13 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/wizard.c | 2 |
4 files changed, 4 insertions, 26 deletions
diff --git a/usr.sbin/sade/disks.c b/usr.sbin/sade/disks.c index 78e700f64173..cabee8bcb08f 100644 --- a/usr.sbin/sade/disks.c +++ b/usr.sbin/sade/disks.c @@ -450,7 +450,7 @@ diskPartition(Device *dev) else #endif Create_Chunk(d, chunk_info[current_chunk]->offset, size, partitiontype, subtype, - (chunk_info[current_chunk]->flags & CHUNK_ALIGN)); + (chunk_info[current_chunk]->flags & CHUNK_ALIGN), ""); variable_set2(DISK_PARTITIONED, "yes", 0); record_chunks(d); } @@ -878,16 +878,10 @@ diskPartitionNonInteractive(Device *dev) for (i = 0; chunk_info[i]; i++) { /* If a chunk is at least 10MB in size, use it. */ if (chunk_info[i]->type == unused && chunk_info[i]->size > (10 * ONE_MEG)) { -#ifdef PC98 Create_Chunk(d, chunk_info[i]->offset, chunk_info[i]->size, freebsd, 3, (chunk_info[i]->flags & CHUNK_ALIGN), "FreeBSD"); -#else - Create_Chunk(d, chunk_info[i]->offset, chunk_info[i]->size, - freebsd, 3, - (chunk_info[i]->flags & CHUNK_ALIGN)); -#endif variable_set2(DISK_PARTITIONED, "yes", 0); break; } @@ -918,14 +912,9 @@ diskPartitionNonInteractive(Device *dev) for (i = 0; chunk_info[i]; i++) { /* If a chunk is at least sz MB, use it. */ if (chunk_info[i]->type == unused && chunk_info[i]->size >= sz) { -#ifdef PC98 Create_Chunk(d, chunk_info[i]->offset, sz, freebsd, 3, (chunk_info[i]->flags & CHUNK_ALIGN), "FreeBSD"); -#else - Create_Chunk(d, chunk_info[i]->offset, sz, freebsd, 3, - (chunk_info[i]->flags & CHUNK_ALIGN)); -#endif variable_set2(DISK_PARTITIONED, "yes", 0); break; } diff --git a/usr.sbin/sade/wizard.c b/usr.sbin/sade/wizard.c index 6dec01dc804d..e9c0da57ced2 100644 --- a/usr.sbin/sade/wizard.c +++ b/usr.sbin/sade/wizard.c @@ -146,7 +146,7 @@ slice_wizard(Disk *d) strtol(cmds[2],0,0), strtol(cmds[3],0,0), strtol(cmds[4],0,0), - strtol(cmds[5],0,0))); + strtol(cmds[5],0,0), "")); continue; } #endif diff --git a/usr.sbin/sysinstall/disks.c b/usr.sbin/sysinstall/disks.c index 78e700f64173..cabee8bcb08f 100644 --- a/usr.sbin/sysinstall/disks.c +++ b/usr.sbin/sysinstall/disks.c @@ -450,7 +450,7 @@ diskPartition(Device *dev) else #endif Create_Chunk(d, chunk_info[current_chunk]->offset, size, partitiontype, subtype, - (chunk_info[current_chunk]->flags & CHUNK_ALIGN)); + (chunk_info[current_chunk]->flags & CHUNK_ALIGN), ""); variable_set2(DISK_PARTITIONED, "yes", 0); record_chunks(d); } @@ -878,16 +878,10 @@ diskPartitionNonInteractive(Device *dev) for (i = 0; chunk_info[i]; i++) { /* If a chunk is at least 10MB in size, use it. */ if (chunk_info[i]->type == unused && chunk_info[i]->size > (10 * ONE_MEG)) { -#ifdef PC98 Create_Chunk(d, chunk_info[i]->offset, chunk_info[i]->size, freebsd, 3, (chunk_info[i]->flags & CHUNK_ALIGN), "FreeBSD"); -#else - Create_Chunk(d, chunk_info[i]->offset, chunk_info[i]->size, - freebsd, 3, - (chunk_info[i]->flags & CHUNK_ALIGN)); -#endif variable_set2(DISK_PARTITIONED, "yes", 0); break; } @@ -918,14 +912,9 @@ diskPartitionNonInteractive(Device *dev) for (i = 0; chunk_info[i]; i++) { /* If a chunk is at least sz MB, use it. */ if (chunk_info[i]->type == unused && chunk_info[i]->size >= sz) { -#ifdef PC98 Create_Chunk(d, chunk_info[i]->offset, sz, freebsd, 3, (chunk_info[i]->flags & CHUNK_ALIGN), "FreeBSD"); -#else - Create_Chunk(d, chunk_info[i]->offset, sz, freebsd, 3, - (chunk_info[i]->flags & CHUNK_ALIGN)); -#endif variable_set2(DISK_PARTITIONED, "yes", 0); break; } diff --git a/usr.sbin/sysinstall/wizard.c b/usr.sbin/sysinstall/wizard.c index 6dec01dc804d..e9c0da57ced2 100644 --- a/usr.sbin/sysinstall/wizard.c +++ b/usr.sbin/sysinstall/wizard.c @@ -146,7 +146,7 @@ slice_wizard(Disk *d) strtol(cmds[2],0,0), strtol(cmds[3],0,0), strtol(cmds[4],0,0), - strtol(cmds[5],0,0))); + strtol(cmds[5],0,0), "")); continue; } #endif |