summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandreast <andreast@FreeBSD.org>2012-04-02 16:26:32 +0000
committerandreast <andreast@FreeBSD.org>2012-04-02 16:26:32 +0000
commit7201e740201fd2198901c22ac85552d1095dc922 (patch)
tree51a2975aa71b761485ae12c0e02a775c1d161ab1
parente14923e42ffe180ed7774dafaf9010345a12e068 (diff)
downloadFreeBSD-src-7201e740201fd2198901c22ac85552d1095dc922.zip
FreeBSD-src-7201e740201fd2198901c22ac85552d1095dc922.tar.gz
- Write the ISO9660 descriptor after the apm partition entries.
- Fill the needed pmPartStatus flags. At least the OpenBIOS implementation relies on these flags. This commit fixes the panic seen on OS-X when inserting a FreeBSD/ppc disc. Additionally OpenBIOS recognizes the partition where the boot code is located. This lets us load a FreeBSD/ppc PowerMac kernel inside qemu. PR: powerpc/162091 MFC after: 1 week
-rw-r--r--usr.sbin/makefs/cd9660/cd9660_eltorito.c36
1 files changed, 28 insertions, 8 deletions
diff --git a/usr.sbin/makefs/cd9660/cd9660_eltorito.c b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
index f25dae7..f26a554 100644
--- a/usr.sbin/makefs/cd9660/cd9660_eltorito.c
+++ b/usr.sbin/makefs/cd9660/cd9660_eltorito.c
@@ -538,9 +538,19 @@ cd9660_write_apm_partition_entry(FILE *fd, int idx, int total_partitions,
off_t sector_start, off_t nsectors, off_t sector_size,
const char *part_name, const char *part_type)
{
- uint32_t apm32;
+ uint32_t apm32, part_status;
uint16_t apm16;
+ /* See Apple Tech Note 1189 for the details about the pmPartStatus
+ * flags.
+ * Below the flags which are default:
+ * - IsValid 0x01
+ * - IsAllocated 0x02
+ * - IsReadable 0x10
+ * - IsWritable 0x20
+ */
+ part_status = 0x01 | 0x02 | 0x10 | 0x20;
+
if (fseeko(fd, (off_t)(idx + 1) * sector_size, SEEK_SET) == -1)
err(1, "fseeko");
@@ -562,6 +572,17 @@ cd9660_write_apm_partition_entry(FILE *fd, int idx, int total_partitions,
fwrite(part_name, strlen(part_name) + 1, 1, fd);
fseek(fd, 32 - strlen(part_name) - 1, SEEK_CUR);
fwrite(part_type, strlen(part_type) + 1, 1, fd);
+ fseek(fd, 32 - strlen(part_type) - 1, SEEK_CUR);
+
+ apm32 = 0;
+ /* pmLgDataStart */
+ fwrite(&apm32, sizeof(apm32), 1, fd);
+ /* pmDataCnt */
+ apm32 = htobe32(nsectors);
+ fwrite(&apm32, sizeof(apm32), 1, fd);
+ /* pmPartStatus */
+ apm32 = htobe32(part_status);
+ fwrite(&apm32, sizeof(apm32), 1, fd);
return 0;
}
@@ -666,12 +687,6 @@ cd9660_write_boot(FILE *fd)
cd9660_write_apm_partition_entry(fd, 0, total_parts, 1,
total_parts, 512, "Apple", "Apple_partition_map");
- /* Write ISO9660 descriptor, enclosing the whole disk */
- cd9660_write_apm_partition_entry(fd, 1, total_parts, 0,
- diskStructure.totalSectors *
- (diskStructure.sectorSize / 512), 512, "ISO9660",
- "CD_ROM_Mode_1");
-
/* Write all partition entries */
apm_partitions = 0;
TAILQ_FOREACH(t, &diskStructure.boot_images, image_list) {
@@ -679,11 +694,16 @@ cd9660_write_boot(FILE *fd)
continue;
cd9660_write_apm_partition_entry(fd,
- 2 + apm_partitions++, total_parts,
+ 1 + apm_partitions++, total_parts,
t->sector * (diskStructure.sectorSize / 512),
t->num_sectors * (diskStructure.sectorSize / 512),
512, "CD Boot", "Apple_Bootstrap");
}
+ /* Write ISO9660 descriptor, enclosing the whole disk */
+ cd9660_write_apm_partition_entry(fd, 2 + apm_partitions,
+ total_parts, 0, diskStructure.totalSectors *
+ (diskStructure.sectorSize / 512), 512, "ISO9660",
+ "CD_ROM_Mode_1");
}
return 0;
OpenPOWER on IntegriCloud