From d55a27339259abb2f643406f767cf518e68f1311 Mon Sep 17 00:00:00 2001 From: Marcel Moolenaar Date: Wed, 12 Nov 2003 17:44:37 +0000 Subject: [PATCH] The partition naming on ia64 (e.g. da0p1) cannot be selected based on whether the parent chunk is of type whole. This also applies to MBR slices for non-GPT disks. Since most of the GPT handling is conditionally compiled, do the same with the partition naming. This fixes a braino that caused slices to be named as GPT partitions and generally messing up an install. Pointy hat: marcel --- lib/libdisk/create_chunk.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/libdisk/create_chunk.c b/lib/libdisk/create_chunk.c index fb3daecd2dd..d3625b93133 100644 --- a/lib/libdisk/create_chunk.c +++ b/lib/libdisk/create_chunk.c @@ -159,8 +159,12 @@ Fixup_Names(struct disk *d) max = NDOSPART; #endif for (j = 1; j <= max; j++) { +#ifdef __ia64__ sprintf(c2->oname, "%s%c%d", c1->name, (c1->type == whole) ? 'p' : 's', j); +#else + sprintf(c2->oname, "%ss%d", c1->name, j); +#endif for (c3 = c1->part; c3; c3 = c3->next) if (c3 != c2 && !strcmp(c3->name, c2->oname)) goto match; -- 2.45.2