diff options
| author | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-14 19:16:40 +0000 |
|---|---|---|
| committer | Kenneth R Westerback <krw@cvs.openbsd.org> | 2006-10-14 19:16:40 +0000 |
| commit | 4ecdf099f8bc77de9ced326a1cc34e08b57fe394 (patch) | |
| tree | 68cd5ecce90feee700e3ba7e13d242147816d068 /sbin/disklabel/disklabel.c | |
| parent | 9e08e617b113b5d19753bd6e22672f0f233aaf03 (diff) | |
Friends don't let friends look for disklabels in Free/NetBSD MBR
partitions since the kernel doesn't put them or look for them there
anymore.
Diffstat (limited to 'sbin/disklabel/disklabel.c')
| -rw-r--r-- | sbin/disklabel/disklabel.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 86e1099a972..538a848902e 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.102 2006/10/14 18:26:55 krw Exp $ */ +/* $OpenBSD: disklabel.c,v 1.103 2006/10/14 19:16:39 krw Exp $ */ /* * Copyright (c) 1987, 1993 @@ -39,7 +39,7 @@ static const char copyright[] = #endif /* not lint */ #ifndef lint -static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.102 2006/10/14 18:26:55 krw Exp $"; +static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.103 2006/10/14 19:16:39 krw Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -656,9 +656,7 @@ readlabel(int f) #ifdef DOSLABEL if (dosdp && letoh32(dosdp->dp_size) && - (dosdp->dp_typ == DOSPTYP_OPENBSD || - dosdp->dp_typ == DOSPTYP_FREEBSD || - dosdp->dp_typ == DOSPTYP_NETBSD)) + (dosdp->dp_typ == DOSPTYP_OPENBSD)) sectoffset = (off_t)letoh32(dosdp->dp_start) * DEV_BSIZE; #endif @@ -1590,9 +1588,7 @@ checklabel(struct disklabel *lp) lp->d_secperunit = lp->d_secpercyl * lp->d_ncylinders; #ifdef i386__notyet if (dosdp && dosdp->dp_size && - (dosdp->dp_typ == DOSPTYP_OPENBSD || - dosdp->dp_typ == DOSPTYP_FREEBSD || - dosdp->dp_typ == DOSPTYP_NETBSD)) { + (dosdp->dp_typ == DOSPTYP_OPENBSD)) { && lp->d_secperunit > dosdp->dp_start + dosdp->dp_size) { warnx("exceeds DOS partition size"); errors++; |