diff options
| author | Andrey V. Elsukov <ae@FreeBSD.org> | 2011-11-06 19:03:07 +0000 |
|---|---|---|
| committer | Andrey V. Elsukov <ae@FreeBSD.org> | 2011-11-06 19:03:07 +0000 |
| commit | b11075cdeb662e3d9b9ead5064a55566746d09b9 (patch) | |
| tree | 95ea34a506c0b1f6b1d2b6720d34dcab3e232132 /sbin/bsdlabel | |
| parent | 3a01367a9bba0f093a45434a610f27630a04cda9 (diff) | |
Notes
Diffstat (limited to 'sbin/bsdlabel')
| -rw-r--r-- | sbin/bsdlabel/bsdlabel.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index 4f5a2c6a3fcd..50f576969fdc 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -831,7 +831,7 @@ getasciilabel(FILE *f, struct disklabel *lp) continue; } if (sscanf(cp, "%lu partitions", &v) == 1) { - if (v == 0 || v > MAXPARTITIONS) { + if (v > MAXPARTITIONS) { fprintf(stderr, "line %d: bad # of partitions\n", lineno); lp->d_npartitions = MAXPARTITIONS; @@ -1186,8 +1186,7 @@ checklabel(struct disklabel *lp) lp->d_secperunit = vl->d_secperunit; if (lp->d_bbsize == 0) lp->d_bbsize = vl->d_bbsize; - if (lp->d_npartitions == 0 || - lp->d_npartitions < DEFPARTITIONS || + if (lp->d_npartitions < DEFPARTITIONS || lp->d_npartitions > MAXPARTITIONS) lp->d_npartitions = vl->d_npartitions; } |