d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chunk functions in libdisk take an extra arguement for all archs to accomodate

Browse Source 
PC98 with less ifdef madness.
This commit is contained in:
Poul-Henning Kamp 2002-10-22 10:52:53 +00:00
parent 1e08b0a637
commit ef4d89ea40
4 changed files with 4 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/sade/disks.c
View File

@ -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;
}

2
usr.sbin/sade/wizard.c
View File

@ -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

13
usr.sbin/sysinstall/disks.c
View File

@ -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;
}

2
usr.sbin/sysinstall/wizard.c
View File

@ -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