summaryrefslogtreecommitdiffstats
path: root/lib/libdisk
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>2002-10-29 17:12:02 +0000
committerphk <phk@FreeBSD.org>2002-10-29 17:12:02 +0000
commitd52f4602e266012495893d291dea249c444f9ed5 (patch)
tree7878b0999e2a3ae9d37cb60ea4738f9955849ef4 /lib/libdisk
parent8cbd99a1e854faad014c3d73a628ff04f414ba84 (diff)
downloadFreeBSD-src-d52f4602e266012495893d291dea249c444f9ed5.zip
FreeBSD-src-d52f4602e266012495893d291dea249c444f9ed5.tar.gz
Getting closer to getting things right:
Always ignore the RAW_PART for BSD. Having no quirks is not a mistake for an architecture. Tested by: DES
Diffstat (limited to 'lib/libdisk')
-rw-r--r--lib/libdisk/chunk.c5
-rw-r--r--lib/libdisk/disk.c2
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/libdisk/chunk.c b/lib/libdisk/chunk.c
index 9dfcad0..07f5aef 100644
--- a/lib/libdisk/chunk.c
+++ b/lib/libdisk/chunk.c
@@ -286,9 +286,7 @@ Add_Chunk(struct disk *d, long offset, u_long size, const char *name,
if (platform == p_sparc64) {
offset = Prev_Cyl_Aligned(d, offset);
size = Next_Cyl_Aligned(d, size);
- break;
- }
- if (platform == p_i386) {
+ } else if (platform == p_i386) {
if (type != freebsd)
break;
if (!(flags & CHUNK_ALIGN))
@@ -320,6 +318,7 @@ Add_Chunk(struct disk *d, long offset, u_long size, const char *name,
/* Convert back to size */
size -= offset;
}
+ break;
/* PLATFORM POLICY END ------------------------------------- */
}
diff --git a/lib/libdisk/disk.c b/lib/libdisk/disk.c
index 267ea19..bc4ce3d 100644
--- a/lib/libdisk/disk.c
+++ b/lib/libdisk/disk.c
@@ -209,7 +209,7 @@ Int_Open_Disk(const char *name)
if (Add_Chunk(d, 0, d->chunks->size, name, freebsd, 0, 0, "-"))
DPRINT(("Failed to add 'freebsd' chunk"));
}
- if (platform == p_i386 && !strcmp(t, "BSD") && i == 2)
+ if (!strcmp(t, "BSD") && i == RAW_PART)
continue;
/* PLATFORM POLICY END --------------------------------------- */
OpenPOWER on IntegriCloud