diff options
| author | Jason Downs <downsj@cvs.openbsd.org> | 1996-06-12 08:02:45 +0000 |
|---|---|---|
| committer | Jason Downs <downsj@cvs.openbsd.org> | 1996-06-12 08:02:45 +0000 |
| commit | 6b4b1e72e45a98113890e3f1772545351866c016 (patch) | |
| tree | c8a91efd1a04e120c86c2bd0d3676b1057d52005 | |
| parent | 9f6ba003da70a0b1f4eeb3f1fedb36339fb6da8e (diff) | |
kill RAWPARTITION, use RAW_PART
| -rw-r--r-- | sbin/disklabel/Makefile | 5 | ||||
| -rw-r--r-- | sbin/disklabel/disklabel.c | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sbin/disklabel/Makefile b/sbin/disklabel/Makefile index 61ebef08865..697d50d257e 100644 --- a/sbin/disklabel/Makefile +++ b/sbin/disklabel/Makefile @@ -1,3 +1,4 @@ +# $OpenBSD: Makefile,v 1.4 1996/06/12 08:02:43 downsj Exp $ # $NetBSD: Makefile,v 1.18 1995/10/17 16:34:04 cgd Exp $ # @(#)Makefile 8.2 (Berkeley) 3/17/94 @@ -21,8 +22,4 @@ CFLAGS+= -DDOSLABEL CFLAGS+= -DNUMBOOT=1 .endif -.if ${MACHINE} == "i386" -CFLAGS+= -DRAWPARTITION=\'d\' -.endif - .include <bsd.prog.mk> diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 10ef2111a8d..429b2857729 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.8 1996/06/08 03:54:56 dm Exp $ */ +/* $OpenBSD: disklabel.c,v 1.9 1996/06/12 08:02:44 downsj Exp $ */ /* $NetBSD: disklabel.c,v 1.30 1996/03/14 19:49:24 ghudson Exp $ */ /* @@ -82,10 +82,6 @@ static char rcsid[] = "$NetBSD: disklabel.c,v 1.30 1996/03/14 19:49:24 ghudson E * for the label on such machines. */ -#ifndef RAWPARTITION -#define RAWPARTITION 'c' -#endif - #ifndef BBSIZE #define BBSIZE 8192 /* size of boot area, with label */ #endif @@ -240,7 +236,7 @@ main(argc, argv) goto ok; } if (dkname[0] != '/') { - (void)sprintf(np, "%sr%s%c", _PATH_DEV, dkname, RAWPARTITION); + (void)sprintf(np, "%sr%s%c", _PATH_DEV, dkname, 'a' + RAW_PART); specname = np; np += strlen(specname) + 1; } else |