From b567bafeb4d22e938191fa74107d6f854c3dd976 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Fri, 21 Sep 2007 16:19:50 +0000 Subject: [PATCH] On PowerPC, geom_part has taken over the partitioning from geom_apple. Translate partitions of type "PART" to chunks of type "apple" on PowerPC. This fixes sysinstall. Approved by: re (kensmith) --- lib/libdisk/open_disk.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/libdisk/open_disk.c b/lib/libdisk/open_disk.c index 798a72a7625..5ffae46fe02 100644 --- a/lib/libdisk/open_disk.c +++ b/lib/libdisk/open_disk.c @@ -184,7 +184,8 @@ Int_Open_Disk(const char *name, char *conftxt) b = strsep(&p, " "); o = strtoimax(b, &r, 0); /* APPLE have ty as a string */ - if ((*r) && (strcmp(t, "APPLE") && strcmp(t, "GPT"))) { + if ((*r) && strcmp(t, "APPLE") && + strcmp(t, "GPT") && strcmp(t, "PART")) { printf("libdisk: Int_Open_Disk(%s): can't parse parameter '%s' in line %d (r='%s')\n", name, a, line, r); break; @@ -277,7 +278,11 @@ Int_Open_Disk(const char *name, char *conftxt) i = Add_Chunk(d, off, len, n, gpt, 0, 0, b); else if (!strcmp(t, "APPLE")) i = Add_Chunk(d, off, len, n, apple, 0, 0, sn); - else + else if (!strcmp(t, "PART")) { +#ifdef __powerpc__ + i = Add_Chunk(d, off, len, n, apple, 0, 0, sn); +#endif + } else ; /* Ignore unknown classes. */ } /* PLATFORM POLICY BEGIN ------------------------------------- */