diff options
| author | Bruce Evans <bde@FreeBSD.org> | 1998-10-17 09:56:32 +0000 |
|---|---|---|
| committer | Bruce Evans <bde@FreeBSD.org> | 1998-10-17 09:56:32 +0000 |
| commit | 7de064209aad6d6993024e009c15b763e76613a6 (patch) | |
| tree | e9974aa0b4faf6915078ef81713f5c0bab3589ff | |
| parent | 93d51dcaf9f2199b3bf43ecf4e025a0aaafc71d2 (diff) | |
Notes
| -rw-r--r-- | sbin/bsdlabel/bsdlabel.c | 16 | ||||
| -rw-r--r-- | sbin/disklabel/disklabel.c | 16 |
2 files changed, 10 insertions, 22 deletions
diff --git a/sbin/bsdlabel/bsdlabel.c b/sbin/bsdlabel/bsdlabel.c index be60d542768a..046daac7018b 100644 --- a/sbin/bsdlabel/bsdlabel.c +++ b/sbin/bsdlabel/bsdlabel.c @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94"; /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ #endif static const char rcsid[] = - "$Id: disklabel.c,v 1.20 1998/08/21 23:44:16 gpalmer Exp $"; + "$Id: disklabel.c,v 1.21 1998/08/23 07:32:37 bde Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -76,12 +76,6 @@ static const char rcsid[] = * for the label on such machines. */ -#ifdef tahoe -#define RAWPARTITION 'a' -#else -#define RAWPARTITION 'c' -#endif - #ifndef BBSIZE #define BBSIZE 8192 /* size of boot area, with label */ #endif @@ -232,7 +226,7 @@ main(argc, argv) dkname = argv[0]; if (dkname[0] != '/') { - (void)sprintf(np, "%sr%s%c", _PATH_DEV, dkname, RAWPARTITION); + (void)sprintf(np, "%sr%s%c", _PATH_DEV, dkname, RAW_PART); specname = np; np += strlen(specname) + 1; } else @@ -483,7 +477,7 @@ l_perror(s) case ESRCH: warnx("%s: no disk label on disk;", s); fprintf(stderr, - "use \"disklabel -r\" to install initial label\n"); + "use \"disklabel -r\" to install initial label\n"); break; case EINVAL: @@ -496,8 +490,8 @@ l_perror(s) break; case EXDEV: - warnx( - "%s: labeled partition or 'a' partition must start at beginning of disk", s); + warnx("%s: '%c' partition must start at beginning of disk", + s, 'a' + RAW_PART); break; default: diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index be60d542768a..046daac7018b 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -46,7 +46,7 @@ static char sccsid[] = "@(#)disklabel.c 8.2 (Berkeley) 1/7/94"; /* from static char sccsid[] = "@(#)disklabel.c 1.2 (Symmetric) 11/28/85"; */ #endif static const char rcsid[] = - "$Id: disklabel.c,v 1.20 1998/08/21 23:44:16 gpalmer Exp $"; + "$Id: disklabel.c,v 1.21 1998/08/23 07:32:37 bde Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -76,12 +76,6 @@ static const char rcsid[] = * for the label on such machines. */ -#ifdef tahoe -#define RAWPARTITION 'a' -#else -#define RAWPARTITION 'c' -#endif - #ifndef BBSIZE #define BBSIZE 8192 /* size of boot area, with label */ #endif @@ -232,7 +226,7 @@ main(argc, argv) dkname = argv[0]; if (dkname[0] != '/') { - (void)sprintf(np, "%sr%s%c", _PATH_DEV, dkname, RAWPARTITION); + (void)sprintf(np, "%sr%s%c", _PATH_DEV, dkname, RAW_PART); specname = np; np += strlen(specname) + 1; } else @@ -483,7 +477,7 @@ l_perror(s) case ESRCH: warnx("%s: no disk label on disk;", s); fprintf(stderr, - "use \"disklabel -r\" to install initial label\n"); + "use \"disklabel -r\" to install initial label\n"); break; case EINVAL: @@ -496,8 +490,8 @@ l_perror(s) break; case EXDEV: - warnx( - "%s: labeled partition or 'a' partition must start at beginning of disk", s); + warnx("%s: '%c' partition must start at beginning of disk", + s, 'a' + RAW_PART); break; default: |