diff options
| -rw-r--r-- | sbin/disklabel/Makefile | 6 | ||||
| -rw-r--r-- | sbin/disklabel/editor.c | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile index 99214573863..94d249d06ac 100644 --- a/sbin/disklabel/Makefile +++ b/sbin/disklabel/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.17 1998/04/25 07:04:45 deraadt Exp $ +# $OpenBSD: Makefile,v 1.18 1998/05/07 06:27:32 millert Exp $ PROG= disklabel SRCS= disklabel.c dkcksum.c editor.c manual.c @@ -16,10 +16,6 @@ manual.c: disklabel.cat8 CFLAGS+= -D${MACHINE} .endif -.if (${MACHINE} == "hp300") || (${MACHINE} == "pmax") -CFLAGS+= -DOLD_SCSI -.endif - .if (${MACHINE} == "i386") CFLAGS+= -DNUMBOOT=2 -DDOSLABEL CFLAGS+= -DSEEALSO="\"fdisk(8), installboot(8)\"" diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index a8168b41201..07f2af371fd 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.35 1998/05/07 06:22:20 millert Exp $ */ +/* $OpenBSD: editor.c,v 1.36 1998/05/07 06:27:34 millert Exp $ */ /* * Copyright (c) 1997 Todd C. Miller <Todd.Miller@courtesan.com> @@ -31,7 +31,7 @@ */ #ifndef lint -static char rcsid[] = "$OpenBSD: editor.c,v 1.35 1998/05/07 06:22:20 millert Exp $"; +static char rcsid[] = "$OpenBSD: editor.c,v 1.36 1998/05/07 06:27:34 millert Exp $"; #endif /* not lint */ #include <sys/types.h> @@ -146,12 +146,6 @@ editor(lp, f) puts("This platform requires that partition offsets/sizes be on cylinder boundaries.\nPartition offsets/sizes will be rounded to the nearest cylinder automatically."); #endif -#if defined(OLD_SCSI) - /* Some ports use the old scsi system that doesn't get the geom right */ - if (strcmp(label.d_packname, "fictitious") == 0) - puts("Warning, driver-generated label. Disk parameters may be " - "incorrect."); -#endif /* Set d_bbsize and d_sbsize as neccesary */ if (strcmp(label.d_packname, "fictitious") == 0) { if (label.d_bbsize == 0) |