summaryrefslogtreecommitdiff
path: root/sys/kern/subr_disklabel.c
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1994-10-17 02:31:33 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1994-10-17 02:31:33 +0000
commit1be9232f73c212626a6a55538a16903570f25a0e (patch)
treed61f364afd761ce50150f05bda0f7afe69d71967 /sys/kern/subr_disklabel.c
parente57dc19458ad6340511908f83eb839878ba9f471 (diff)
Notes
Diffstat (limited to 'sys/kern/subr_disklabel.c')
-rw-r--r--sys/kern/subr_disklabel.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sys/kern/subr_disklabel.c b/sys/kern/subr_disklabel.c
index 2d3721011f7f..f1162693d9d0 100644
--- a/sys/kern/subr_disklabel.c
+++ b/sys/kern/subr_disklabel.c
@@ -36,7 +36,7 @@
* SUCH DAMAGE.
*
* @(#)ufs_disksubr.c 8.5 (Berkeley) 1/21/94
- * $Id: ufs_disksubr.c,v 1.3 1994/08/02 07:54:53 davidg Exp $
+ * $Id: ufs_disksubr.c,v 1.4 1994/10/08 06:57:23 phk Exp $
*/
#include <sys/param.h>
@@ -361,11 +361,14 @@ writedisklabel(dev, strat, lp)
int error = 0;
labelpart = dkpart(dev);
+ /* XXX this is wrong. But leaving it in is worse. */
+#ifndef __FREEBSD__
if (lp->d_partitions[labelpart].p_offset != 0) {
if (lp->d_partitions[0].p_offset != 0)
return (EXDEV); /* not quite right */
labelpart = 0;
}
+#endif
bp = geteblk((int)lp->d_secsize);
bp->b_dev = makedev(major(dev), dkminor(dkunit(dev), labelpart));
bp->b_blkno = LABELSECTOR;