diff options
Diffstat (limited to 'sbin/disklabel/disklabel.8')
| -rw-r--r-- | sbin/disklabel/disklabel.8 | 72 |
1 files changed, 14 insertions, 58 deletions
diff --git a/sbin/disklabel/disklabel.8 b/sbin/disklabel/disklabel.8 index 85b8b040c4f..ac121057c04 100644 --- a/sbin/disklabel/disklabel.8 +++ b/sbin/disklabel/disklabel.8 @@ -1,4 +1,4 @@ -.\" $OpenBSD: disklabel.8,v 1.66 2008/01/25 15:30:11 otto Exp $ +.\" $OpenBSD: disklabel.8,v 1.67 2008/03/23 19:42:17 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: January 25 2008 $ +.Dd $Mdocdate: March 23 2008 $ .Dt DISKLABEL 8 .Os .Sh NAME @@ -41,24 +41,24 @@ .Nd read and write disk pack label .Sh SYNOPSIS .Nm disklabel -.Op Fl c | d | r | t +.Op Fl c | d | t .Op Fl v .Op Fl p Ar unit .Ar disk .Nm disklabel .Fl w -.Op Fl c | d | r +.Op Fl c | d .Op Fl nv .Ar disk Ar disktype .Op Ar packid .Nm disklabel .Fl e -.Op Fl c | d | r +.Op Fl c | d .Op Fl nv .Ar disk .Nm disklabel .Fl E -.Op Fl c | d | r +.Op Fl c | d .Op Fl nv .Op Fl f Ar tempfile .Ar disk @@ -119,9 +119,6 @@ depending on the system boot architecture .It Fl c Clear the system's in-core copy of the label and update it based on the on-disk label. -May not be used in conjunction with the -.Fl r -flag. .It Fl d Use the .Em default @@ -131,9 +128,6 @@ This ignores any existing partitions on the disk. Note that this option will only work for disks that are capable of reporting their geometry, such as SCSI, IDE, and ESDI. -May not be used in conjunction with the -.Fl r -flag. .It Fl E Use a simple initial label editor, using the command-driven built-in editor described below. @@ -179,15 +173,6 @@ Restore a disk label that was formatted in a prior operation and saved in an .Tn ASCII file. -.It Fl r -Causes the label to be read from or written to the disk directly, -rather than going through the system's in-core copy of the label. -This option may allow a label to be installed on a disk without kernel -support for a label, such as when labels are first installed on a -system. -This flag does not work on a number of architectures, thus it is -not considered the right way to put a new label on a disk. -Its use is discouraged. .It Fl s Ar boot2 On machines with a two-level bootstrap .Pq such as i386-based systems , @@ -238,9 +223,7 @@ The first form of the command is used to examine the label on the named disk drive. It will display all of the parameters associated with the drive and its partition layout. -Unless the -.Fl r -flag is given, the kernel's in-core copy of the label is displayed; if +The kernel's in-core copy of the label is displayed; if the disk has no label, or the partition types on the disk are incorrect, the kernel may have constructed or modified the label. .Pp @@ -255,27 +238,13 @@ installation as described below. The optional argument is a pack identification string, up to 16 characters long. The pack ID must be quoted if it contains blanks. -If the -.Fl r -flag is given, the disk sectors containing the label and bootstrap -will be written directly. -A side-effect of this is that any existing -bootstrap code will be overwritten and the disk rendered unbootable. -If -.Fl r -is not specified, the existing label will be updated via the in-core +The existing label will be updated via the in-core copy and any bootstrap code will be unaffected. -If the disk does not already have a label, the -.Fl r -flag must be used. -In either case, the kernel's in-core label is replaced. .Pp In the third form of the command .Pq edit , -the label is read from the in-core kernel copy, or directly from the disk if the -.Fl r -flag is also given. -The label is formatted and then supplied to an editor for changes. +the label is read from the in-core kernel copy +and then supplied to an editor for changes. If no editor is specified in an .Ev EDITOR environment variable, @@ -283,9 +252,7 @@ environment variable, is used. When the editor terminates, the formatted label is reread and used to rewrite the disk label. -Existing bootstrap code is unchanged regardless of whether -.Fl r -was specified. +Existing bootstrap code is unchanged. .Pp The initial label editor mode .Pq fourth form @@ -467,11 +434,7 @@ as that produced when reading or editing a label. Comments are delimited by .Ar # and newline. -As with -.Fl w , -any existing bootstrap code will be clobbered if -.Fl r -is specified and will be unaffected otherwise. +Any existing bootstrap code will be unaffected. .Pp The sixth form of the command .Pq protect @@ -573,21 +536,14 @@ Create a label for sd0 based on information for found in .Pa /etc/disktab . Any existing bootstrap code will be clobbered. -(Normally you do not want to use the -.Fl r -flag though.) .Pp -.Dl # disklabel -w -r /dev/rsd0c sd2212 foo +.Dl # disklabel -w /dev/rsd0c sd2212 foo .Pp Read the on-disk label for sd0, edit it and reinstall in-core as well as on-disk. -(Normally you do not want to use the -.Fl r -flag -though.) Existing bootstrap code is unaffected. .Pp -.Dl # disklabel -e -r sd0 +.Dl # disklabel -e sd0 .Pp Restore the on-disk and in-core label for sd0 from information in .Pa mylabel . |