From ddc0cb6817f86bd4f73d449193a4e250936085b4 Mon Sep 17 00:00:00 2001 From: phk Date: Mon, 14 Mar 2005 15:22:18 +0000 Subject: Do not attach MBR on top of an MBR. This removes some confusing slice names on disks with extended partitions. Spotted on: Mother-in-laws computer. --- sys/geom/geom_mbr.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/geom/geom_mbr.c b/sys/geom/geom_mbr.c index 868c0e0..b7d832b 100644 --- a/sys/geom/geom_mbr.c +++ b/sys/geom/geom_mbr.c @@ -267,6 +267,8 @@ g_mbr_taste(struct g_class *mp, struct g_provider *pp, int insist) g_trace(G_T_TOPOLOGY, "mbr_taste(%s,%s)", mp->name, pp->name); g_topology_assert(); + if (!strcmp(pp->geom->class->name, MBR_CLASS_NAME)) + return (NULL); gp = g_slice_new(mp, NDOSPART, pp, &cp, &ms, sizeof *ms, g_mbr_start); if (gp == NULL) return (NULL); -- cgit v1.1