diff options
| author | Marcel Moolenaar <marcel@FreeBSD.org> | 2008-07-26 22:52:12 +0000 |
|---|---|---|
| committer | Marcel Moolenaar <marcel@FreeBSD.org> | 2008-07-26 22:52:12 +0000 |
| commit | ee5040596ca68dbd68a0e7193d5e7dee6fff117e (patch) | |
| tree | 32ec05f5f9b2a579fe359cebd7522a3a8a901746 /lib/libdisk | |
| parent | 0c7367d9290e773ccd6e9ea110404190ccb7d475 (diff) | |
Notes
Diffstat (limited to 'lib/libdisk')
| -rw-r--r-- | lib/libdisk/open_disk.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/lib/libdisk/open_disk.c b/lib/libdisk/open_disk.c index 5ffae46fe028..6ffe88d61a4e 100644 --- a/lib/libdisk/open_disk.c +++ b/lib/libdisk/open_disk.c @@ -193,7 +193,7 @@ Int_Open_Disk(const char *name, char *conftxt) if (!strcmp(a, "o")) off = o; else if (!strcmp(a, "i")) - i = o; + i = (!strcmp(t, "PART")) ? o - 1 : o; else if (!strcmp(a, "ty")) ty = o; else if (!strcmp(a, "sc")) @@ -202,6 +202,14 @@ Int_Open_Disk(const char *name, char *conftxt) hd = o; else if (!strcmp(a, "alt")) alt = o; + else if (!strcmp(a, "xs")) + t = b; + else if (!strcmp(a, "xt")) { + if (*r) + sn = b; + else + ty = o; + } } /* PLATFORM POLICY BEGIN ----------------------------------- */ @@ -278,11 +286,7 @@ 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 if (!strcmp(t, "PART")) { -#ifdef __powerpc__ - i = Add_Chunk(d, off, len, n, apple, 0, 0, sn); -#endif - } else + else ; /* Ignore unknown classes. */ } /* PLATFORM POLICY BEGIN ------------------------------------- */ |