summaryrefslogtreecommitdiff
path: root/sbin
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-07 19:51:09 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2007-06-07 19:51:09 +0000
commita6375dcfa344ccca09970470724321331cb34fd6 (patch)
tree930d5639f362d4f7a1493fc04448e6a51f4c3d46 /sbin
parent295c73b89b441e306186461ae6ec40392a61d4f6 (diff)
do not complain about c not being a multiple of lp->d_secpercyl; ok millert
Diffstat (limited to 'sbin')
-rw-r--r--sbin/disklabel/disklabel.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index 837e9c9ae2b..467f468a1c4 100644
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: disklabel.c,v 1.110 2007/05/29 06:28:15 otto Exp $ */
+/* $OpenBSD: disklabel.c,v 1.111 2007/06/07 19:51:08 deraadt 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.110 2007/05/29 06:28:15 otto Exp $";
+static const char rcsid[] = "$OpenBSD: disklabel.c,v 1.111 2007/06/07 19:51:08 deraadt Exp $";
#endif /* not lint */
#include <sys/param.h>
@@ -1650,10 +1650,10 @@ checklabel(struct disklabel *lp)
warnx("warning, partition %c: size 0, but offset %d",
part, pp->p_offset);
#ifdef CYLCHECK
- if (pp->p_size % lp->d_secpercyl)
+ if (i != RAW_PART && pp->p_size % lp->d_secpercyl)
warnx("warning, partition %c: size %% cylinder-size != 0",
part);
- if (pp->p_offset % lp->d_secpercyl)
+ if (i != RAW_PART && pp->p_offset % lp->d_secpercyl)
warnx("warning, partition %c: offset %% cylinder-size != 0",
part);
#endif