sparc/sun3 labels want cyl-alignment; grr

diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile
index 83f24c9..15b32f3 100644 (file)
--- a/sbin/disklabel/Makefile
+++ b/sbin/disklabel/Makefile
@@ -1,4 +1,4 @@
-#      $OpenBSD: Makefile,v 1.7 1996/09/24 04:35:17 deraadt Exp $
+#      $OpenBSD: Makefile,v 1.8 1997/04/20 08:59:36 deraadt Exp $
 #      $NetBSD: Makefile,v 1.18 1995/10/17 16:34:04 cgd Exp $
 #      @(#)Makefile    8.2 (Berkeley) 3/17/94
 
@@ -27,7 +27,7 @@ CFLAGS+= -DNUMBOOT=1
 .endif
 
 .if (${MACHINE} == "sun3") || (${MACHINE} == "sparc")
-CFLAGS+= -DSEEALSO="\"installboot(8)\""
+CFLAGS+= -DSEEALSO="\"installboot(8)\"" -DCYLCHECK
 .endif
 
 .if (${MACHINE} == "mvme68k") || (${MACHINE} == "mvme68k")

diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c
index db13e58..207fd72 100644 (file)
--- a/sbin/disklabel/disklabel.c
+++ b/sbin/disklabel/disklabel.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: disklabel.c,v 1.29 1997/04/10 22:26:13 millert Exp $  */
+/*     $OpenBSD: disklabel.c,v 1.30 1997/04/20 08:59:40 deraadt Exp $  */
 /*     $NetBSD: disklabel.c,v 1.30 1996/03/14 19:49:24 ghudson Exp $   */
 
 /*
@@ -44,7 +44,7 @@ static char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
-static char rcsid[] = "$OpenBSD: disklabel.c,v 1.29 1997/04/10 22:26:13 millert Exp $";
+static char rcsid[] = "$OpenBSD: disklabel.c,v 1.30 1997/04/20 08:59:40 deraadt Exp $";
 #endif /* not lint */
 
 #include <sys/param.h>
@@ -1387,7 +1387,7 @@ checklabel(lp)
                if (pp->p_size == 0 && pp->p_offset != 0)
                        warnx("warning, partition %c: size 0, but offset %d",
                            part, pp->p_offset);
-#ifdef notdef
+#ifdef CYLCHECK
                if (pp->p_size % lp->d_secpercyl)
                        warnx("warning, partition %c: size %% cylinder-size != 0",
                            part);