d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

First scrub of s/disklabel/bsdlabel/

Browse Source 
bsdlabel.5 deliberately exempted, its contents looks less than useful.
This commit is contained in:
Poul-Henning Kamp 2003-04-18 19:44:12 +00:00
parent f029471dbe
commit 2c60b6689a
3 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sbin/bsdlabel/Makefile
View File

@ -1,9 +1,10 @@
# @(#)Makefile 8.2 (Berkeley) 3/17/94
# $FreeBSD$
PROG= disklabel
SRCS= disklabel.c
MAN= disklabel.5 disklabel.8
PROG= bsdlabel
SRCS= bsdlabel.c
#MAN+= bsdlabel.5
MAN+= bsdlabel.8
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98

34
sbin/bsdlabel/bsdlabel.8
View File

@ -36,10 +36,10 @@
.\" $FreeBSD$
.\"
.Dd March 15, 2003
.Dt DISKLABEL 8
.Dt BSDLABEL 8
.Os
.Sh NAME
.Nm disklabel
.Nm bsdlabel
.Nd read and write disk pack label
.Sh SYNOPSIS
.Nm
@ -731,7 +731,7 @@ The asterisk
indicates that the partition does not begin or end exactly on a
cylinder boundary.
.Sh EXAMPLES
.Dl "disklabel da0s1"
.Dl "bsdlabel da0s1"
.Pp
Display the in-core label for the first slice of the
.Pa da0
@ -742,7 +742,7 @@ disk, as obtained via
the base disk name should be specified, such as
.Pa da0 . )
.Pp
.Dl "disklabel da0s1 > savedlabel"
.Dl "bsdlabel da0s1 > savedlabel"
.Pp
Save the in-core label for
.Pa da0s1
@ -752,7 +752,7 @@ This file can be used with the
.Fl R
option to restore the label at a later date.
.Pp
.Dl "disklabel -w -r /dev/da0s1 da2212 foo"
.Dl "bsdlabel -w -r /dev/da0s1 da2212 foo"
.Pp
Create a label for
.Pa da0s1
@ -763,14 +763,14 @@ found in
Any existing bootstrap code will be clobbered
and the disk rendered unbootable.
.Pp
.Dl "disklabel -e -r da0s1"
.Dl "bsdlabel -e -r da0s1"
.Pp
Read the on-disk label for
.Pa da0s1 ,
edit it, and reinstall in-core as well as on-disk.
Existing bootstrap code is unaffected.
.Pp
.Dl "disklabel -e -r -n da0s1"
.Dl "bsdlabel -e -r -n da0s1"
.Pp
Read the on-disk label for
.Pa da0s1 ,
@ -779,7 +779,7 @@ It does
.Em not
install the new label either in-core or on-disk.
.Pp
.Dl "disklabel -r -w da0s1 auto"
.Dl "bsdlabel -r -w da0s1 auto"
.Pp
Try to auto-detect the required information from
.Pa da0s1 ,
@ -789,7 +789,7 @@ Use another
command to edit the
partitioning and file system information.
.Pp
.Dl "disklabel -R da0s1 savedlabel"
.Dl "bsdlabel -R da0s1 savedlabel"
.Pp
Restore the on-disk and in-core label for
.Pa da0s1
@ -797,7 +797,7 @@ from information in
.Pa savedlabel .
Existing bootstrap code is unaffected.
.Pp
.Dl "disklabel -R -n da0s1 label_layout"
.Dl "bsdlabel -R -n da0s1 label_layout"
.Pp
Display what the label would be for
.Pa da0s1
@ -810,7 +810,7 @@ or
.Cm *
partition sizes.
.Pp
.Dl "disklabel -B da0s1"
.Dl "bsdlabel -B da0s1"
.Pp
Install a new bootstrap on
.Pa da0s1 .
@ -818,7 +818,7 @@ The boot code comes from
.Pa /boot/boot .
On-disk and in-core labels are unchanged.
.Pp
.Dl "disklabel -w -B /dev/da0s1 -b newboot da2212"
.Dl "bsdlabel -w -B /dev/da0s1 -b newboot da2212"
.Pp
Install a new label and bootstrap.
The label is derived from
@ -833,8 +833,8 @@ in the current working directory.
dd if=/dev/zero of=/dev/da0 bs=512 count=32
fdisk -BI da0
dd if=/dev/zero of=/dev/da0s1 bs=512 count=32
disklabel -w -B da0s1 auto
disklabel -e da0s1
bsdlabel -w -B da0s1 auto
bsdlabel -e da0s1
.Ed
.Pp
Completely wipe any prior information on the disk, creating a new bootable
@ -856,7 +856,7 @@ such as
and
.Cm * ,
which could be used as a source file for
.Dq Li "disklabel -R ad0s1c new_label_file" :
.Dq Li "bsdlabel -R ad0s1c new_label_file" :
.Bd -literal -offset 4n
# /dev/ad0s1c:
type: ESDI
@ -889,7 +889,7 @@ drivedata: 0
.Sh SEE ALSO
.Xr ccd 4 ,
.Xr md 4 ,
.Xr disklabel 5 ,
.Xr bsdlabel 5 ,
.Xr disktab 5 ,
.Xr boot0cfg 8 ,
.Xr fdisk 8 ,
@ -973,4 +973,4 @@ if the
partition does not start at 0 or does not cover the entire slice,
if a partition runs past the end of the device,
and a number of other errors,
but no warning is given if space remains unused.
but no warning is given if space remains unused.

16
sbin/bsdlabel/bsdlabel.c
View File

@ -107,7 +107,7 @@ __FBSDID("$FreeBSD$");
#include "pathnames.h"
/*
* Disklabel: read and write disklabels.
* Disklabel: read and write bsdlabels.
* The label is usually placed on one of the first sectors of the disk.
* Many machines also place a bootstrap in the same area,
* in which case the label is embedded in the bootstrap.
@ -1563,19 +1563,19 @@ usage(void)
fprintf(stderr,
"%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n",
"usage: disklabel [-r] disk",
"usage: bsdlabel [-r] disk",
"\t\t(to read label)",
" disklabel -w [-nr] [-m machine] disk type [packid]",
" bsdlabel -w [-nr] [-m machine] disk type [packid]",
"\t\t(to write label with existing boot program)",
" disklabel -e [-nr] [-m machine] disk",
" bsdlabel -e [-nr] [-m machine] disk",
"\t\t(to edit label)",
" disklabel -R [-nr] [-m machine] disk protofile",
" bsdlabel -R [-nr] [-m machine] disk protofile",
"\t\t(to restore label with existing boot program)",
" disklabel -B [-b boot] [-m machine] disk",
" bsdlabel -B [-b boot] [-m machine] disk",
"\t\t(to install boot program with existing on-disk label)",
" disklabel -w -B [-n] [-b boot] [-m machine] disk type [packid]",
" bsdlabel -w -B [-n] [-b boot] [-m machine] disk type [packid]",
"\t\t(to write label and install boot program)",
" disklabel -R -B [-n] [-b boot] [-m machine] disk protofile",
" bsdlabel -R -B [-n] [-b boot] [-m machine] disk protofile",
"\t\t(to restore label and install boot program)"
);
exit(1);