diff options
| -rw-r--r-- | sys/arch/mac68k/mac68k/disksubr.c | 233 |
1 files changed, 149 insertions, 84 deletions
diff --git a/sys/arch/mac68k/mac68k/disksubr.c b/sys/arch/mac68k/mac68k/disksubr.c index 20f4e267b35..830fa54a495 100644 --- a/sys/arch/mac68k/mac68k/disksubr.c +++ b/sys/arch/mac68k/mac68k/disksubr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disksubr.c,v 1.57 2009/05/21 23:45:48 krw Exp $ */ +/* $OpenBSD: disksubr.c,v 1.58 2009/06/24 20:52:41 miod Exp $ */ /* $NetBSD: disksubr.c,v 1.22 1997/11/26 04:18:20 briggs Exp $ */ /* @@ -86,18 +86,19 @@ #define NUM_PARTS_PROBED 32 +#define NO_PART 0 #define ROOT_PART 1 #define UFS_PART 2 #define SWAP_PART 3 #define HFS_PART 4 #define SCRATCH_PART 5 -int getFreeLabelEntry(struct disklabel *); -int whichType(struct partmapentry *); -int fixPartTable(struct partmapentry *, long, char *); -void setPart(struct partmapentry *, struct disklabel *, int, int); -int getNamedType(struct partmapentry *, int, struct disklabel *, int, int, int *); -char *read_mac_label(char *, struct disklabel *); +int getFreeLabelEntry(struct disklabel *); +int whichType(struct partmapentry *); +int fixPartTable(struct partmapentry *, long, char *); +void setPart(struct partmapentry *, struct disklabel *, int, int); +int getNamedType(struct partmapentry *, int8_t *, int, int, int); +char *read_mac_label(char *, struct disklabel *, int); /* * Find an entry in the disk label that is unused and return it @@ -109,8 +110,7 @@ getFreeLabelEntry(struct disklabel *lp) int i; for (i = 0; i < MAXPARTITIONS; i++) { - if (i != RAW_PART && - lp->d_partitions[i].p_fstype == FS_UNUSED) + if (i != RAW_PART && lp->d_partitions[i].p_fstype == FS_UNUSED) return i; } return -1; @@ -125,19 +125,23 @@ whichType(struct partmapentry *part) struct blockzeroblock *bzb; if (part->pmPartType[0] == '\0') - return 0; + return NO_PART; + /* + * Do not show MacOS internal use partitions. + */ if (strcmp(PART_DRIVER_TYPE, (char *)part->pmPartType) == 0 || strcmp(PART_DRIVER43_TYPE, (char *)part->pmPartType) == 0 || strcmp(PART_DRIVERATA_TYPE, (char *)part->pmPartType) == 0 || strcmp(PART_FWB_COMPONENT_TYPE, (char *)part->pmPartType) == 0 || strcmp(PART_PARTMAP_TYPE, (char *)part->pmPartType) == 0) - return 0; + return NO_PART; + if (strcmp(PART_UNIX_TYPE, (char *)part->pmPartType) == 0) { /* unix part, swap, root, usr */ bzb = (struct blockzeroblock *)(&part->pmBootArgs); if (bzb->bzbMagic != BZB_MAGIC) - return 0; + return NO_PART; if (bzb->bzbFlags & BZB_ROOTFS) return ROOT_PART; @@ -150,15 +154,10 @@ whichType(struct partmapentry *part) if (bzb->bzbType == BZB_TYPESWAP) return SWAP_PART; - - return SCRATCH_PART; } if (strcmp(PART_MAC_TYPE, (char *)part->pmPartType) == 0) return HFS_PART; -/* - if (strcmp(PART_SCRATCH, (char *)part->pmPartType) == 0) - return SCRATCH_PART; -*/ + return SCRATCH_PART; /* no known type, but label it, anyway */ } @@ -187,6 +186,7 @@ fixPartTable(struct partmapentry *partTable, long size, char *base) pmap->pmPartName[31] = '\0'; pmap->pmPartType[31] = '\0'; + /* toupper the string, in case caps are different... */ for (s = pmap->pmPartType; *s; s++) if ((*s >= 'a') && (*s <= 'z')) *s = (*s - 'a' + 'A'); @@ -200,47 +200,30 @@ setPart(struct partmapentry *part, struct disklabel *lp, int fstype, int slot) DL_SETPSIZE(&lp->d_partitions[slot], part->pmPartBlkCnt); DL_SETPOFFSET(&lp->d_partitions[slot], part->pmPyPartStart); lp->d_partitions[slot].p_fstype = fstype; - part->pmPartType[0] = '\0'; } int -getNamedType(struct partmapentry *part, int num_parts, struct disklabel *lp, - int type, int alt, int *maxslot) +getNamedType(struct partmapentry *part, int8_t *parttypes, int num_parts, + int type, int alt) { struct blockzeroblock *bzb; int i; for (i = 0; i < num_parts; i++) { - if (whichType(&(part[i])) == type) { - switch (type) { - case ROOT_PART: - bzb = (struct blockzeroblock *) - (&part[i].pmBootArgs); - if (alt >= 0 && alt != bzb->bzbCluster) - goto skip; - setPart(&(part[i]), lp, FS_BSDFFS, 0); - break; - case UFS_PART: - bzb = (struct blockzeroblock *) - (&part[i].pmBootArgs); - if (alt >= 0 && alt != bzb->bzbCluster) - goto skip; - setPart(&(part[i]), lp, FS_BSDFFS, 6); - if (*maxslot < 6) - *maxslot = 6; - break; - case SWAP_PART: - setPart(&(part[i]), lp, FS_SWAP, 1); - if (*maxslot < 1) - *maxslot = 1; - break; - default: - printf("disksubr.c: can't do type %d\n", type); - break; - } - return 0; + if (parttypes[i] != type) + continue; + + switch (type) { + case ROOT_PART: + case UFS_PART: + bzb = (struct blockzeroblock *)&part[i].pmBootArgs; + if (alt >= 0 && alt != bzb->bzbCluster) + continue; + break; + case SWAP_PART: + break; } -skip: + return i; } return -1; } @@ -262,63 +245,145 @@ skip: * disk. This whole algorithm should probably be changed in the future. */ char * -read_mac_label(char *dlbuf, struct disklabel *lp) +read_mac_label(char *dlbuf, struct disklabel *lp, int spoofonly) { - int i, num_parts, maxslot = RAW_PART; + int i, num_parts; + int root_part, swap_part, usr_part; + uint64_t bsdstart, bsdend; struct partmapentry *pmap; + int8_t parttype[NUM_PARTS_PROBED]; pmap = (struct partmapentry *)malloc(NUM_PARTS_PROBED * sizeof(struct partmapentry), M_DEVBUF, M_NOWAIT); if (pmap == NULL) return ("out of memory"); + bsdend = 0; + bsdstart = DL_GETDSIZE(lp); + num_parts = fixPartTable(pmap, lp->d_secsize, dlbuf); - if (getNamedType(pmap, num_parts, lp, ROOT_PART, 0, &maxslot)) - getNamedType(pmap, num_parts, lp, ROOT_PART, -1, &maxslot); - getNamedType(pmap, num_parts, lp, SWAP_PART, -1, &maxslot); - if (getNamedType(pmap, num_parts, lp, UFS_PART, 0, &maxslot)) - getNamedType(pmap, num_parts, lp, UFS_PART, -1, &maxslot); - for (i = 0; i < num_parts; i++) { - int partType, slot; + for (i = 0; i < num_parts; i++) + parttype[i] = whichType(&pmap[i]); + + /* + * Find out our /, swap and /usr partitions, preferrably + * with a bzbCluster value of zero. + */ + root_part = getNamedType(pmap, parttype, num_parts, ROOT_PART, 0); + if (root_part < 0) + root_part = + getNamedType(pmap, parttype, num_parts, ROOT_PART, -1); + swap_part = getNamedType(pmap, parttype, num_parts, SWAP_PART, -1); + usr_part = getNamedType(pmap, parttype, num_parts, UFS_PART, 0); + if (usr_part < 0) + usr_part = + getNamedType(pmap, parttype, num_parts, UFS_PART, -1); + + /* + * Figure out the OpenBSD part of the disk. + * Unfortunately, since each OpenBSD partition maps to an A/UX + * partition, the OpenBSD area may not be contiguous. + * We return the range containing all OpenBSD partitions, and + * hope the user will setup the disk with a single contiguous + * area... + */ - slot = getFreeLabelEntry(lp); - if (slot < 0) + for (i = 0; i < num_parts; i++) { + switch (parttype[i]) { + case ROOT_PART: + /* + * If there are multiple A/UX Root partitions, + * only count `ours' in the OpenBSD area. + */ + if (i != root_part) + continue; break; + case SWAP_PART: + case UFS_PART: + break; + default: + continue; + } + + if (bsdstart > pmap[i].pmPyPartStart) + bsdstart = pmap[i].pmPyPartStart; + if (bsdend < pmap[i].pmPyPartStart + pmap[i].pmPartBlkCnt) + bsdend = pmap[i].pmPyPartStart + pmap[i].pmPartBlkCnt; + } + + /* + * Add all partitions to the disklabel. + */ - partType = whichType(&(pmap[i])); + if (root_part >= 0) + setPart(&pmap[root_part], lp, FS_BSDFFS, 0); /* a */ + if (swap_part >= 0) + setPart(&pmap[swap_part], lp, FS_SWAP, 1); /* b */ + if (usr_part >= 0) + setPart(&pmap[usr_part], lp, FS_BSDFFS, 6); /* g */ - switch (partType) { + for (i = 0; i < num_parts; i++) { + int slot, fstype; + + if (i == root_part || i == swap_part || i == usr_part) + continue; + + if ((slot = getFreeLabelEntry(lp)) < 0) + break; + + switch (parttype[i]) { + default: + fstype = FS_UNUSED; + break; case ROOT_PART: + fstype = FS_BSDFFS; + break; case UFS_PART: - setPart(&(pmap[i]), lp, FS_BSDFFS, slot); - if (slot > maxslot) - maxslot = slot; + fstype = FS_BSDFFS; break; case SWAP_PART: - setPart(&(pmap[i]), lp, FS_SWAP, slot); - if (slot > maxslot) - maxslot = slot; + fstype = FS_SWAP; break; case HFS_PART: - setPart(&(pmap[i]), lp, FS_HFS, slot); - if (slot > maxslot) - maxslot = slot; + fstype = FS_HFS; break; case SCRATCH_PART: - setPart(&(pmap[i]), lp, FS_OTHER, slot); - if (slot > maxslot) - maxslot = slot; - break; - default: + fstype = FS_OTHER; break; } + if (fstype != FS_UNUSED) + setPart(&pmap[i], lp, fstype, slot); + } + + free(pmap, M_DEVBUF); + + DL_SETBSTART(lp, bsdstart); + DL_SETBEND(lp, bsdend < DL_GETDSIZE(lp) ? bsdend : DL_GETDSIZE(lp)); + + /* + * Clear BSD partitions if spoofing. We had to insert them to be sure + * the HFS partitions would appear at the right positions. + */ + if (spoofonly) { + for (i = 0; i < MAXPARTITIONS; i++) { + switch (lp->d_partitions[i].p_fstype) { + case FS_BSDFFS: + case FS_SWAP: /* XXX maybe unwise */ + lp->d_partitions[i].p_fstype = FS_UNUSED; + DL_SETPSIZE(&lp->d_partitions[i], 0); + DL_SETPOFFSET(&lp->d_partitions[i], 0); + break; + } + } + + return (NULL); } + lp->d_npartitions = MAXPARTITIONS; lp->d_version = 1; lp->d_checksum = 0; lp->d_checksum = dkcksum(lp); - free(pmap, M_DEVBUF); - return (checkdisklabel(lp, lp)); + return (checkdisklabel(lp, lp, bsdstart, bsdend)); } /* @@ -344,9 +409,6 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), bp = geteblk(size); bp->b_dev = dev; - if (spoofonly) - goto doslabel; - bp->b_blkno = LABELSECTOR; bp->b_bcount = size; bp->b_flags = B_BUSY | B_READ | B_RAW; @@ -358,11 +420,14 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), sbSigp = (u_int16_t *)bp->b_data; if (*sbSigp == 0x4552) { - msg = read_mac_label(bp->b_data, lp); + msg = read_mac_label(bp->b_data, lp, spoofonly); if (msg == NULL) goto done; } + if (spoofonly) + goto doslabel; + /* Get a MI label */ bp->b_blkno = LABELSECTOR; bp->b_bcount = lp->d_secsize; @@ -373,7 +438,7 @@ readdisklabel(dev_t dev, void (*strat)(struct buf *), goto done; } - msg = checkdisklabel(bp->b_data + LABELOFFSET, lp); + msg = checkdisklabel(bp->b_data + LABELOFFSET, lp, 0, DL_GETDSIZE(lp)); if (msg == NULL) goto done; |