diff options
author | Peter Wemm <peter@FreeBSD.org> | 1995-12-07 10:34:59 +0000 |
---|---|---|
committer | Peter Wemm <peter@FreeBSD.org> | 1995-12-07 10:34:59 +0000 |
commit | 40b0c0d936b1fb9878b178e19028ab6a045fe8bc (patch) | |
tree | 3d31cd880ab6a9af9ad3ab3c6313d70e1c542d60 /lib/libdisk | |
parent | cde694287a635a30da358e47c21ed4eff6e8d0e5 (diff) | |
download | src-40b0c0d936b1fb9878b178e19028ab6a045fe8bc.tar.gz src-40b0c0d936b1fb9878b178e19028ab6a045fe8bc.zip |
Update the -current sources from the 2.1 branch.
Approved (in spirit) by: jkh
Notes
Notes:
svn path=/head/; revision=12661
Diffstat (limited to 'lib/libdisk')
-rw-r--r-- | lib/libdisk/change.c | 7 | ||||
-rw-r--r-- | lib/libdisk/create_chunk.c | 506 | ||||
-rw-r--r-- | lib/libdisk/libdisk.h | 17 | ||||
-rw-r--r-- | lib/libdisk/tst01.c | 9 | ||||
-rw-r--r-- | lib/libdisk/write_disk.c | 6 |
5 files changed, 311 insertions, 234 deletions
diff --git a/lib/libdisk/change.c b/lib/libdisk/change.c index 57ccbfade012..7d7f811cb294 100644 --- a/lib/libdisk/change.c +++ b/lib/libdisk/change.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: change.c,v 1.8.2.1 1995/06/05 02:24:20 jkh Exp $ + * $Id: change.c,v 1.9.2.1 1995/09/20 10:43:01 jkh Exp $ * */ @@ -46,7 +46,7 @@ Set_Bios_Geom(struct disk *disk, u_long cyl, u_long hd, u_long sect) } void -All_FreeBSD(struct disk *d) +All_FreeBSD(struct disk *d, int force_all) { struct chunk *c; @@ -57,5 +57,6 @@ All_FreeBSD(struct disk *d) goto again; } c=d->chunks; - Create_Chunk(d,c->offset,c->size,freebsd,0xa5,0); + Create_Chunk(d,c->offset,c->size,freebsd,0xa5, + force_all? CHUNK_FORCE_ALL: 0); } diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c index ad0c8020134a..6c32a7d9a640 100644 --- a/lib/libdisk/create_chunk.c +++ b/lib/libdisk/create_chunk.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: create_chunk.c,v 1.20.2.1 1995/05/31 23:53:45 jkh Exp $ + * $Id: create_chunk.c,v 1.21.2.6 1995/11/18 10:02:10 jkh Exp $ * */ @@ -15,6 +15,8 @@ #include <unistd.h> #include <string.h> #include <ctype.h> +#include <fcntl.h> +#include <stdarg.h> #include <sys/types.h> #include <sys/disklabel.h> #include <sys/diskslice.h> @@ -23,275 +25,335 @@ #include <err.h> #include "libdisk.h" -void -Fixup_FreeBSD_Names(struct disk *d, struct chunk *c) +/* Clone these two from sysinstall because we need our own copies + * due to link order problems with `crunch'. Feh! + */ +static int +isDebug() { - struct chunk *c1, *c3; - int j; - - if (!strcmp(c->name, "X")) return; - - /* reset all names to "X" */ - for (c1 = c->part; c1 ; c1 = c1->next) { - c1->oname = c1->name; - c1->name = malloc(12); - if(!c1->name) err(1,"Malloc failed"); - strcpy(c1->name,"X"); - } - - /* Allocate the first swap-partition we find */ - for (c1 = c->part; c1 ; c1 = c1->next) { - if (c1->type == unused) continue; - if (c1->subtype != FS_SWAP) continue; - sprintf(c1->name,"%s%c",c->name,SWAP_PART+'a'); - break; - } - - /* Allocate the first root-partition we find */ - for (c1 = c->part; c1 ; c1 = c1->next) { - if (c1->type == unused) continue; - if (!(c1->flags & CHUNK_IS_ROOT)) continue; - sprintf(c1->name,"%s%c",c->name,0+'a'); - break; - } + static int debug = 0; /* Allow debugger to tweak it */ - /* Try to give them the same as they had before */ - for (c1 = c->part; c1 ; c1 = c1->next) { - if (strcmp(c1->name,"X")) continue; - for(c3 = c->part; c3 ; c3 = c3->next) - if (c1 != c3 && !strcmp(c3->name, c1->oname)) { - goto newname; - } - strcpy(c1->name,c1->oname); - newname: - } + return debug; +} +/* Write something to the debugging port */ +static void +msgDebug(char *fmt, ...) +{ + va_list args; + char *dbg; + static int DebugFD = -1; - /* Allocate the rest sequentially */ - for (c1 = c->part; c1 ; c1 = c1->next) { - const char order[] = "efghabd"; - if (c1->type == unused) continue; - if (strcmp("X",c1->name)) continue; + if (DebugFD == -1) + DebugFD = open("/dev/ttyv1", O_RDWR); + dbg = (char *)alloca(FILENAME_MAX); + strcpy(dbg, "DEBUG: "); + va_start(args, fmt); + vsnprintf((char *)(dbg + strlen(dbg)), FILENAME_MAX, fmt, args); + va_end(args); + write(DebugFD, dbg, strlen(dbg)); +} - for(j=0;j<strlen(order);j++) { - sprintf(c1->name,"%s%c",c->name,order[j]); - for(c3 = c->part; c3 ; c3 = c3->next) - if (c1 != c3 && !strcmp(c3->name, c1->name)) - goto match; - break; - match: - strcpy(c1->name,"X"); - continue; - } - } - for (c1 = c->part; c1 ; c1 = c1->next) { - free(c1->oname); - c1->oname = 0; +void +Fixup_FreeBSD_Names(struct disk *d, struct chunk *c) +{ + struct chunk *c1, *c3; + int j; + + if (!strcmp(c->name, "X")) return; + + /* reset all names to "X" */ + for (c1 = c->part; c1 ; c1 = c1->next) { + c1->oname = c1->name; + c1->name = malloc(12); + if(!c1->name) err(1,"Malloc failed"); + strcpy(c1->name,"X"); + } + + /* Allocate the first swap-partition we find */ + for (c1 = c->part; c1 ; c1 = c1->next) { + if (c1->type == unused) continue; + if (c1->subtype != FS_SWAP) continue; + sprintf(c1->name,"%s%c",c->name,SWAP_PART+'a'); + break; + } + + /* Allocate the first root-partition we find */ + for (c1 = c->part; c1 ; c1 = c1->next) { + if (c1->type == unused) continue; + if (!(c1->flags & CHUNK_IS_ROOT)) continue; + sprintf(c1->name,"%s%c",c->name,0+'a'); + break; + } + + /* Try to give them the same as they had before */ + for (c1 = c->part; c1 ; c1 = c1->next) { + if (strcmp(c1->name,"X")) continue; + for(c3 = c->part; c3 ; c3 = c3->next) + if (c1 != c3 && !strcmp(c3->name, c1->oname)) { + goto newname; + } + strcpy(c1->name,c1->oname); + newname: + } + + + /* Allocate the rest sequentially */ + for (c1 = c->part; c1 ; c1 = c1->next) { + const char order[] = "efghabd"; + if (c1->type == unused) continue; + if (strcmp("X",c1->name)) continue; + + for(j=0;j<strlen(order);j++) { + sprintf(c1->name,"%s%c",c->name,order[j]); + for(c3 = c->part; c3 ; c3 = c3->next) + if (c1 != c3 && !strcmp(c3->name, c1->name)) + goto match; + break; + match: + strcpy(c1->name,"X"); + continue; } + } + for (c1 = c->part; c1 ; c1 = c1->next) { + free(c1->oname); + c1->oname = 0; + } } void Fixup_Extended_Names(struct disk *d, struct chunk *c) { - struct chunk *c1; - int j=5; - - for (c1 = c->part; c1 ; c1 = c1->next) { - if (c1->type == unused) continue; - free(c1->name); - c1->name = malloc(12); - if(!c1->name) err(1,"malloc failed"); - sprintf(c1->name,"%ss%d",d->chunks->name,j++); - if (c1->type == freebsd) - Fixup_FreeBSD_Names(d,c1); - } + struct chunk *c1; + int j=5; + + for (c1 = c->part; c1 ; c1 = c1->next) { + if (c1->type == unused) continue; + free(c1->name); + c1->name = malloc(12); + if(!c1->name) err(1,"malloc failed"); + sprintf(c1->name,"%ss%d",d->chunks->name,j++); + if (c1->type == freebsd) + Fixup_FreeBSD_Names(d,c1); + } } void Fixup_Names(struct disk *d) { - struct chunk *c1, *c2, *c3; - int i,j; - - c1 = d->chunks; - for(i=1,c2 = c1->part; c2 ; c2 = c2->next) { - c2->flags &= ~CHUNK_BSD_COMPAT; - if (c2->type == unused) - continue; - if (strcmp(c2->name,"X")) - continue; - c2->oname = malloc(12); - if(!c2->oname) err(1,"malloc failed"); - for(j=1;j<=NDOSPART;j++) { - sprintf(c2->oname,"%ss%d",c1->name,j); - for(c3 = c1->part; c3 ; c3 = c3->next) - if (c3 != c2 && !strcmp(c3->name, c2->oname)) - goto match; - free(c2->name); - c2->name = c2->oname; - c2->oname = 0; - break; - match: - continue; - } - if (c2->oname) - free(c2->oname); + struct chunk *c1, *c2, *c3; + int i,j; + + c1 = d->chunks; + for(i=1,c2 = c1->part; c2 ; c2 = c2->next) { + c2->flags &= ~CHUNK_BSD_COMPAT; + if (c2->type == unused) + continue; + if (strcmp(c2->name,"X")) + continue; + c2->oname = malloc(12); + if(!c2->oname) err(1,"malloc failed"); + for(j=1;j<=NDOSPART;j++) { + sprintf(c2->oname,"%ss%d",c1->name,j); + for(c3 = c1->part; c3 ; c3 = c3->next) + if (c3 != c2 && !strcmp(c3->name, c2->oname)) + goto match; + free(c2->name); + c2->name = c2->oname; + c2->oname = 0; + break; + match: + continue; } - for(c2 = c1->part; c2 ; c2 = c2->next) { - if (c2->type == freebsd) { - c2->flags |= CHUNK_BSD_COMPAT; - break; - } - } - for(c2 = c1->part; c2 ; c2 = c2->next) { - if (c2->type == freebsd) - Fixup_FreeBSD_Names(d,c2); - if (c2->type == extended) - Fixup_Extended_Names(d,c2); + if (c2->oname) + free(c2->oname); + } + for(c2 = c1->part; c2 ; c2 = c2->next) { + if (c2->type == freebsd) { + c2->flags |= CHUNK_BSD_COMPAT; + break; } + } + for(c2 = c1->part; c2 ; c2 = c2->next) { + if (c2->type == freebsd) + Fixup_FreeBSD_Names(d,c2); + if (c2->type == extended) + Fixup_Extended_Names(d,c2); + } } int Create_Chunk(struct disk *d, u_long offset, u_long size, chunk_e type, int subtype, u_long flags) { - int i; - u_long l; - + int i; + u_long l; + + if(!(flags & CHUNK_FORCE_ALL)) + { /* Never use the first track */ if (!offset) { - offset += d->bios_sect; - size -= d->bios_sect; + offset += d->bios_sect; + size -= d->bios_sect; } - + /* Always end on cylinder boundary */ l = (offset+size) % (d->bios_sect * d->bios_hd); size -= l; - - i = Add_Chunk(d,offset,size,"X",type,subtype,flags); - Fixup_Names(d); - return i; + } + + i = Add_Chunk(d,offset,size,"X",type,subtype,flags); + Fixup_Names(d); + return i; } struct chunk * Create_Chunk_DWIM(struct disk *d, struct chunk *parent , u_long size, chunk_e type, int subtype, u_long flags) { - int i; - struct chunk *c1; - u_long offset,edge; - - if (!parent) - parent = d->chunks; - for (c1=parent->part; c1 ; c1 = c1->next) { - if (c1->type != unused) continue; - if (c1->size < size) continue; - offset = c1->offset; - goto found; - } - warn("Not enough unused space"); + int i; + struct chunk *c1; + u_long offset,edge; + + if (!parent) + parent = d->chunks; + for (c1=parent->part; c1 ; c1 = c1->next) { + if (c1->type != unused) continue; + if (c1->size < size) continue; + offset = c1->offset; + goto found; + } + warn("Not enough unused space"); + return 0; + found: + if (parent->flags & CHUNK_BAD144) { + edge = c1->end - d->bios_sect - 127; + if (offset > edge) + return 0; + if (offset + size > edge) + size = edge - offset + 1; + } + i = Add_Chunk(d,offset,size,"X",type,subtype,flags); + if (i) { + warn("Didn't cut it"); return 0; - found: - if (parent->flags & CHUNK_BAD144) { - edge = c1->end - d->bios_sect - 127; - if (offset > edge) - return 0; - if (offset + size > edge) - size = edge - offset + 1; - } - i = Add_Chunk(d,offset,size,"X",type,subtype,flags); - if (i) { - warn("Didn't cut it"); - return 0; - } - Fixup_Names(d); - for (c1=parent->part; c1 ; c1 = c1->next) - if (c1->offset == offset) - return c1; - err(1,"Serious internal trouble"); + } + Fixup_Names(d); + for (c1=parent->part; c1 ; c1 = c1->next) + if (c1->offset == offset) + return c1; + err(1,"Serious internal trouble"); } int MakeDev(struct chunk *c1, char *path) { - char *p = c1->name; - u_long cmaj,bmaj,min,unit,part,slice; - char buf[BUFSIZ],buf2[BUFSIZ]; + char *p = c1->name; + u_long cmaj, bmaj, min, unit, part, slice; + char buf[BUFSIZ], buf2[BUFSIZ]; - *buf2 = '\0'; - - if(!strcmp(p,"X")) - return 0; - - if (p[0] == 'w' && p[1] == 'd') { - bmaj = 0; cmaj = 3; - } else if (p[0] == 's' && p[1] == 'd') { - bmaj = 4; cmaj = 13; - } else { - return 0; - } - p += 2; - if (!isdigit(*p)) - return 0; - unit = *p - '0'; - p++; - if (isdigit(*p)) { - unit *= 10; - unit = *p - '0'; - p++; - } - if (!*p) { - slice = 1; - part = 2; - goto done; - } - if (*p != 's') - return 0; + *buf2 = '\0'; + if (isDebug()) + msgDebug("MakeDev: Called with %s on path %s\n", p, path); + if (!strcmp(p, "X")) + return 0; + + if (!strncmp(p, "wd", 2)) + bmaj = 0, cmaj = 3; + else if (!strncmp(p, "sd", 2)) + bmaj = 4, cmaj = 13; + else { + return 0; + } + p += 2; + if (!isdigit(*p)) { + msgDebug("MakeDev: Invalid disk unit passed: %s\n", p); + return 0; + } + unit = *p - '0'; + p++; + if (!*p) { + slice = 1; + part = 2; + goto done; + } + else if (isdigit(*p)) { + unit *= 10; + unit += (*p - '0'); p++; - if (!isdigit(*p)) - return 0; - slice = *p - '0'; + } + if (*p != 's') { + msgDebug("MakeDev: `%s' is not a valid slice delimiter\n", p); + return 0; + } + p++; + if (!isdigit(*p)) { + msgDebug("MakeDev: `%s' is an invalid slice number\n", p); + return 0; + } + slice = *p - '0'; + p++; + if (isdigit(*p)) { + slice *= 10; + slice += (*p - '0'); p++; - if (isdigit(*p)) { - slice *= 10; - slice = *p - '0'; - p++; - } - slice = slice+1; - if (!*p) { - part = 2; - if(c1->type == freebsd) - sprintf(buf2,"%sc",c1->name); - goto done; - } - if (*p < 'a' || *p > 'h') - return 0; - part = *p - 'a'; - done: - if (unit > 32) - return 0; - if (slice > 32) - return 0; - min = unit * 8 + 65536 * slice + part; - sprintf(buf,"%s/r%s",path,c1->name); - unlink(buf); mknod(buf,S_IFCHR|0640,makedev(cmaj,min)); - if(*buf2) { - sprintf(buf,"%s/r%s",path,buf2); - unlink(buf); mknod(buf,S_IFCHR|0640,makedev(cmaj,min)); + } + slice = slice + 1; + if (!*p) { + part = 2; + if(c1->type == freebsd) + sprintf(buf2, "%sc", c1->name); + goto done; + } + if (*p < 'a' || *p > 'h') { + msgDebug("MakeDev: `%s' is not a valid partition name.\n", p); + return 0; + } + part = *p - 'a'; + done: + if (isDebug()) + msgDebug("MakeDev: Unit %d, Slice %d, Part %d\n", unit, slice, part); + if (unit > 32) + return 0; + if (slice > 32) + return 0; + min = unit * 8 + 65536 * slice + part; + sprintf(buf, "%s/r%s", path, c1->name); + unlink(buf); + if (mknod(buf, S_IFCHR|0640, makedev(cmaj,min)) == -1) { + msgDebug("mknod of %s returned failure status!\n", buf); + return 0; + } + if (*buf2) { + sprintf(buf, "%s/r%s", path, buf2); + unlink(buf); + if (mknod(buf, S_IFCHR|0640, makedev(cmaj,min)) == -1) { + msgDebug("mknod of %s returned failure status!\n", buf); + return 0; } - sprintf(buf,"%s/%s",path,c1->name); - unlink(buf); mknod(buf,S_IFBLK|0640,makedev(bmaj,min)); - return 1; + } + sprintf(buf, "%s/%s", path, c1->name); + unlink(buf); + if (mknod(buf, S_IFBLK|0640, makedev(bmaj,min)) == -1) { + msgDebug("mknod of %s returned failure status!\n", buf); + return 0; + } + return 1; } -void -MakeDevChunk(struct chunk *c1,char *path) +int +MakeDevChunk(struct chunk *c1, char *path) { - MakeDev(c1,path); - if (c1->next) MakeDevChunk(c1->next,path); - if (c1->part) MakeDevChunk(c1->part,path); + int i; + + i = MakeDev(c1, path); + if (c1->next) + MakeDevChunk(c1->next, path); + if (c1->part) + MakeDevChunk(c1->part, path); + return i; } -void -MakeDevDisk(struct disk *d,char *path) +int +MakeDevDisk(struct disk *d, char *path) { - MakeDevChunk(d->chunks,path); + return MakeDevChunk(d->chunks, path); } diff --git a/lib/libdisk/libdisk.h b/lib/libdisk/libdisk.h index e7d6bd3bcd67..e277f876307a 100644 --- a/lib/libdisk/libdisk.h +++ b/lib/libdisk/libdisk.h @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: libdisk.h,v 1.18.2.2 1995/06/05 02:24:32 jkh Exp $ + * $Id: libdisk.h,v 1.19.2.2 1995/10/13 08:19:12 jkh Exp $ * */ @@ -74,6 +74,10 @@ struct chunk { /* This 'part' is a rootfs, allocate 'a' */ # define CHUNK_ACTIVE 32 /* This is the active slice in the MBR */ +# define CHUNK_FORCE_ALL 64 + /* Force a dedicated disk for FreeBSD, bypassing + * all BIOS geometry considerations + */ void (*private_free)(void*); void *(*private_clone)(void*); @@ -138,8 +142,10 @@ Create_Chunk(struct disk *disk, u_long offset, u_long size, chunk_e type, int su */ void -All_FreeBSD(struct disk *d); - /* Make one FreeBSD chunk covering the entire disk +All_FreeBSD(struct disk *d, int force_all); + /* Make one FreeBSD chunk covering the entire disk; + * if force_all is set, bypass all BIOS geometry + * considerations. */ char * @@ -211,7 +217,10 @@ Create_Chunk_DWIM(struct disk *d, struct chunk *parent , u_long size, chunk_e ty * enough is used. */ -void +int +MakeDev(struct chunk *c, char *path); + +int MakeDevDisk(struct disk *d,char *path); /* Make device nodes for all chunks on this disk */ diff --git a/lib/libdisk/tst01.c b/lib/libdisk/tst01.c index 2793778edd40..76e479b6a1b5 100644 --- a/lib/libdisk/tst01.c +++ b/lib/libdisk/tst01.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: tst01.c,v 1.14.2.1 1995/06/05 02:24:35 jkh Exp $ + * $Id: tst01.c,v 1.15.2.1 1995/09/20 10:43:04 jkh Exp $ * */ @@ -189,7 +189,11 @@ main(int argc, char **argv) continue; } if (!strcasecmp(*cmds,"allfreebsd")) { - All_FreeBSD(d); + All_FreeBSD(d, 0); + continue; + } + if (!strcasecmp(*cmds,"dedicate")) { + All_FreeBSD(d, 1); continue; } if (!strcasecmp(*cmds,"bios") && ncmd == 4) { @@ -280,6 +284,7 @@ main(int argc, char **argv) printf("\007ERROR\n"); printf("CMDS:\n"); printf("\tallfreebsd\n"); + printf("\tdedicate\n"); printf("\tbios cyl hd sect\n"); printf("\tboot\n"); printf("\tbteasy17\n"); diff --git a/lib/libdisk/write_disk.c b/lib/libdisk/write_disk.c index e745917e5bae..00b2946bcfd4 100644 --- a/lib/libdisk/write_disk.c +++ b/lib/libdisk/write_disk.c @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $Id: write_disk.c,v 1.14 1995/06/11 19:29:38 rgrimes Exp $ + * $Id: write_disk.c,v 1.15 1995/08/26 04:57:03 davidg Exp $ * */ @@ -79,11 +79,11 @@ Write_FreeBSD(int fd, struct disk *new, struct disk *old, struct chunk *c1) dl->d_secsize = 512; dl->d_secperunit = new->chunks->size; #if 0 - dl->d_secpercyl = new->real_cyl ? new->real_cyl : new->bios_cyl; + dl->d_ncylinders = new->real_cyl ? new->real_cyl : new->bios_cyl; dl->d_ntracks = new->real_hd ? new->real_hd : new->bios_hd; dl->d_nsectors = new->real_sect ? new->real_sect : new->bios_sect; #else - dl->d_secpercyl = new->bios_cyl; + dl->d_ncylinders = new->bios_cyl; dl->d_ntracks = new->bios_hd; dl->d_nsectors = new->bios_sect; #endif |