summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Moolenaar <marcel@FreeBSD.org>2004-10-31 01:28:59 +0000
committerMarcel Moolenaar <marcel@FreeBSD.org>2004-10-31 01:28:59 +0000
commita1107cc375d4dbfeaa6430e63d8e210ec54ee6b0 (patch)
tree1ecd0db40f26bdb02f9266011e0bea29042af444
parentb86e6ec007b0588faa7da2de902a9c8588927769 (diff)
Notes
-rw-r--r--lib/libdisk/chunk.c1
-rw-r--r--lib/libdisk/open_disk.c4
2 files changed, 3 insertions, 2 deletions
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c
index ef63ccc90f3f..fb43ef5192a0 100644
--- a/lib/libdisk/chunk.c
+++ b/lib/libdisk/chunk.c
@@ -252,6 +252,7 @@ Add_Chunk(struct disk *d, daddr_t offset, daddr_t size, const char *name,
case p_amd64:
switch (type) {
case fat:
+ case gpt:
case mbr:
case extended:
case freebsd:
diff --git a/lib/libdisk/open_disk.c b/lib/libdisk/open_disk.c
index 8a8229b41d47..9e487a9bb154 100644
--- a/lib/libdisk/open_disk.c
+++ b/lib/libdisk/open_disk.c
@@ -167,7 +167,7 @@ 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")) {
+ if ((*r) && (strcmp(t, "APPLE") && strcmp(t, "GPT"))) {
printf("BARF %d <%d>\n", __LINE__, *r);
exit (0);
}
@@ -256,7 +256,7 @@ Int_Open_Disk(const char *name, char *conftxt)
break;
}
} else if (!strcmp(t, "GPT"))
- i = Add_Chunk(d, off, len, n, ty, 0, 0, 0);
+ 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