diff options
| author | obrien <obrien@FreeBSD.org> | 1998-04-24 11:49:57 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 1998-04-24 11:49:57 +0000 |
| commit | 82338a65ac065e56341527cef7a5c5d8fac62eff (patch) | |
| tree | 38d2b178706eb2dd290623140d69131701396c6c /sys | |
| parent | c0b0bc1742a4fee13983eb4dc86f7edc8f008a2b (diff) | |
| download | FreeBSD-src-82338a65ac065e56341527cef7a5c5d8fac62eff.zip FreeBSD-src-82338a65ac065e56341527cef7a5c5d8fac62eff.tar.gz | |
Create virgin disklabels with 8 (MAXPARTITIONS) partitions rather than
three (RAW_PART + 1);
This makes ``disklabel -Brw sdN auto'' do the Right Thing.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/subr_diskslice.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/kern/subr_diskslice.c b/sys/kern/subr_diskslice.c index 4b11dc6..b8efa0e 100644 --- a/sys/kern/subr_diskslice.c +++ b/sys/kern/subr_diskslice.c @@ -46,7 +46,7 @@ * from: wd.c,v 1.55 1994/10/22 01:57:12 phk Exp $ * from: @(#)ufs_disksubr.c 7.16 (Berkeley) 5/4/91 * from: ufs_disksubr.c,v 1.8 1994/06/07 01:21:39 phk Exp $ - * $Id: subr_diskslice.c,v 1.42 1998/02/15 05:41:31 bde Exp $ + * $Id: subr_diskslice.c,v 1.43 1998/04/19 23:31:56 julian Exp $ */ #include "opt_devfs.h" @@ -631,7 +631,7 @@ dsopen(dname, dev, mode, sspp, lp, strat, setgeom, bdevsw, cdevsw) dsgone(sspp); return (error); } - lp->d_npartitions = RAW_PART + 1; + lp->d_npartitions = MAXPARTITIONS; lp->d_partitions[RAW_PART].p_size = lp->d_secperunit; ssp = *sspp; #ifdef DEVFS @@ -675,8 +675,6 @@ dsopen(dname, dev, mode, sspp, lp, strat, setgeom, bdevsw, cdevsw) lp1->d_rpm = 3600; if (lp1->d_interleave == 0) lp1->d_interleave = 1; - if (lp1->d_npartitions == 0) - lp1->d_npartitions = MAXPARTITIONS; if (lp1->d_bbsize == 0) lp1->d_bbsize = BBSIZE; if (lp1->d_sbsize == 0) |
