diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-09 06:03:25 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2007-06-09 06:03:25 +0000 |
| commit | bc00e9af4d2970ddea42b9b64777fed386690920 (patch) | |
| tree | 24a10c88f6f0c186535e3c8b2050d7c322e06444 /sys/kern | |
| parent | 60176cec161247f678592833268aa24e3991b986 (diff) | |
handle C non-0 start after doing v1 converstion.. sigh
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/subr_disk.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c index ca40dcd8e7d..325116a5839 100644 --- a/sys/kern/subr_disk.c +++ b/sys/kern/subr_disk.c @@ -1,4 +1,4 @@ -/* $OpenBSD: subr_disk.c,v 1.54 2007/06/09 04:08:37 deraadt Exp $ */ +/* $OpenBSD: subr_disk.c,v 1.55 2007/06/09 06:03:24 deraadt Exp $ */ /* $NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $ */ /* @@ -198,13 +198,6 @@ disklabeltokernlabel(struct disklabel *lp) lp->d_secperunith = 0; } - /* XXX this should not be here */ - if (DL_GETPOFFSET(&lp->d_partitions[RAW_PART]) != 0) { - printf("disklabeltokernlabel: Your raw partition MUST start at 0\n"); - DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0); - DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp)); - } - for (i = 0; i < MAXPARTITIONS; i++, pp++, v0pp++) { if (oversion == 0) { pp->p_fragblock = DISKLABELV1_FFS_FRAGBLOCK(v0pp-> @@ -234,6 +227,13 @@ disklabeltokernlabel(struct disklabel *lp) } #endif } + + /* XXX this should not be here */ + if (DL_GETPOFFSET(&lp->d_partitions[RAW_PART]) != 0) { + printf("disklabeltokernlabel: Your raw partition MUST start at 0\n"); + DL_SETPOFFSET(&lp->d_partitions[RAW_PART], 0); + DL_SETPSIZE(&lp->d_partitions[RAW_PART], DL_GETDSIZE(lp)); + } } /* |