diff options
Diffstat (limited to 'sbin/disklabel')
| -rw-r--r-- | sbin/disklabel/disklabel.8 | 15 | ||||
| -rw-r--r-- | sbin/disklabel/disklabel.c | 10 |
2 files changed, 7 insertions, 18 deletions
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8 index 3c43e789dd0..92a60c3e39a 100644 --- a/sbin/disklabel/disklabel.8 +++ b/sbin/disklabel/disklabel.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: disklabel.8,v 1.104 2011/09/04 08:29:46 jmc Exp $ +.\" $OpenBSD: disklabel.8,v 1.105 2012/01/02 00:59:33 krw Exp $ .\" $NetBSD: disklabel.8,v 1.9 1995/03/18 14:54:38 cgd Exp $ .\" .\" Copyright (c) 1987, 1988, 1991, 1993 @@ -33,7 +33,7 @@ .\" .\" @(#)disklabel.8 8.2 (Berkeley) 4/19/94 .\" -.Dd $Mdocdate: September 4 2011 $ +.Dd $Mdocdate: January 2 2012 $ .Dt DISKLABEL 8 .Os .Sh NAME @@ -71,21 +71,18 @@ .Fl B\ \& .Op Fl nv .Op Fl b Ar boot1 -.Op Fl s Ar boot2 .Ar disk .Op Ar disktype .Nm disklabel .Fl Bw .Op Fl nv .Op Fl b Ar boot1 -.Op Fl s Ar boot2 .Ar disk Ar disktype .Op Ar packid .Nm disklabel .Fl BR .Op Fl nv .Op Fl b Ar boot1 -.Op Fl s Ar boot2 .Ar disk Ar protofile .Op Ar disktype .Sh DESCRIPTION @@ -136,9 +133,7 @@ done using an type program, as described in .Xr boot 8 . .It Fl b Ar boot1 -Specify the single level boot program, or the primary boot program, -depending on the system boot architecture -.Pq single or two-level . +Specify the primary boot program. .It Fl c Clear the system's in-core copy of the label and update it based on the on-disk label. @@ -199,10 +194,6 @@ Restore a disk label that was formatted in a prior operation and saved in an .Tn ASCII file. -.It Fl s Ar boot2 -On machines with a two-level bootstrap -.Pq such as i386-based systems , -specify the secondary boot program. .It Fl t Format the label as a .Xr disktab 5 diff --git a/sbin/disklabel/disklabel.c b/sbin/disklabel/disklabel.c index 731d2111762..5f640de3346 100644 --- a/sbin/disklabel/disklabel.c +++ b/sbin/disklabel/disklabel.c @@ -1,4 +1,4 @@ -/* $OpenBSD: disklabel.c,v 1.181 2011/06/05 11:57:17 krw Exp $ */ +/* $OpenBSD: disklabel.c,v 1.182 2012/01/02 00:59:33 krw Exp $ */ /* * Copyright (c) 1987, 1993 @@ -86,7 +86,6 @@ int installboot; /* non-zero if we should install a boot program */ char *bootbuf; /* pointer to buffer with remainder of boot prog */ int bootsize; /* size of remaining boot program */ char *xxboot; /* primary boot */ -char *bootxx; /* secondary boot */ char boot0[MAXPATHLEN]; void setbootflag(struct disklabel *); #endif @@ -124,7 +123,7 @@ main(int argc, char *argv[]) struct disklabel *lp; FILE *t; - while ((ch = getopt(argc, argv, "ABEf:F:hRb:cdenp:s:tvw")) != -1) + while ((ch = getopt(argc, argv, "ABEf:F:hRb:cdenp:tvw")) != -1) switch (ch) { case 'A': ++aflag; @@ -516,7 +515,7 @@ makebootarea(char *boot, struct disklabel *dp, int f) * We are installing a boot program. Determine the name(s) and * read them into the appropriate places in the boot area. */ - if (!xxboot || !bootxx) { + if (!xxboot) { dkbasename = np; if ((p = strrchr(dkname, '/')) == NULL) p = dkname; @@ -539,8 +538,7 @@ makebootarea(char *boot, struct disklabel *dp, int f) } } if (verbose) - warnx("bootstraps: xxboot = %s, bootxx = %s", xxboot, - bootxx ? bootxx : "NONE"); + warnx("bootstrap: xxboot = %s", xxboot); /* * For NUMBOOT > 0 architectures (hp300/hppa/hppa64/landisk/vax) |