diff options
author | phk <phk@FreeBSD.org> | 2003-01-26 14:35:53 +0000 |
---|---|---|
committer | phk <phk@FreeBSD.org> | 2003-01-26 14:35:53 +0000 |
commit | 4865a58cd6760c2a3695e5f7b6b7bf42560ced68 (patch) | |
tree | 05ca104856c345004ad578237dae21946338473c /sbin/bsdlabel/bsdlabel.8 | |
parent | f48c20899ab581d93853c6e18cb43080f58facda (diff) | |
download | FreeBSD-src-4865a58cd6760c2a3695e5f7b6b7bf42560ced68.zip FreeBSD-src-4865a58cd6760c2a3695e5f7b6b7bf42560ced68.tar.gz |
Drop the silly notion that i386 has two bootstrap files now that sys/boot
creates a single file named just "boot".
Apart from the fact that the option "-s" is now gone and that "-b" should
be pointed at /boot/boot instead of /boot/boot1, this patch should be
a no-op.
Diffstat (limited to 'sbin/bsdlabel/bsdlabel.8')
-rw-r--r-- | sbin/bsdlabel/bsdlabel.8 | 36 |
1 files changed, 11 insertions, 25 deletions
diff --git a/sbin/bsdlabel/bsdlabel.8 b/sbin/bsdlabel/bsdlabel.8 index b3df66e..ab18c6f 100644 --- a/sbin/bsdlabel/bsdlabel.8 +++ b/sbin/bsdlabel/bsdlabel.8 @@ -65,8 +65,7 @@ .Nm .Fl B .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk .Oo Ar disktype/auto Oc @@ -75,8 +74,7 @@ .Fl B .Op Fl n .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk Ar disktype/auto .Oo Ar packid Oc @@ -85,8 +83,7 @@ .Fl B .Op Fl n .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk Ar protofile .Oo Ar disktype/auto Oc @@ -330,8 +327,7 @@ bootblocks in the slice. .Nm .Fl B .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk .Oo Ar disktype Oc @@ -349,8 +345,7 @@ This command is typically run on a slice such as .Fl B .Op Fl n .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk Ar disktype .Oo Ar packid Oc @@ -372,8 +367,7 @@ disklabel that would have been written will be printed to stdout. .Fl B .Op Fl n .Oo -.Fl b Ar boot1 -.Fl s Ar boot2 +.Fl b Ar boot .Oc .Ar disk Ar protofile .Oo Ar disktype Oc @@ -423,12 +417,8 @@ parameters of the .Xr disktab 5 entry for the disk if the disktab entry exists and includes those parameters. .It -Otherwise, the default boot image names are used: -.Pa /boot/boot1 -and -.Pa /boot/boot2 -for the standard stage1 and stage2 boot images (details may vary -on architectures like the Alpha, where only a single-stage boot is used). +Otherwise, the default boot image name are used: +.Pa /boot/boot . .El .Ss Initializing/Formatting a bootable disk from scratch .Pp @@ -743,21 +733,17 @@ partition sizes. Install a new bootstrap on .Pa da0s1 . The boot code comes from -.Pa /boot/boot1 -and possibly -.Pa /boot/boot2 . +.Pa /boot/boot . On-disk and in-core labels are unchanged. .Pp -.Dl disklabel -w -B /dev/da0s1 -b newboot1 -s newboot2 da2212 +.Dl disklabel -w -B /dev/da0s1 -b newboot da2212 .Pp Install a new label and bootstrap. The label is derived from disktab information for .Dq da2212 and installed both in-core and on-disk. The bootstrap code comes from the files -.Pa /boot/newboot1 -and -.Pa /boot/newboot2 . +.Pa /boot/newboot .Pp .Dl dd if=/dev/zero of=/dev/da0 bs=512 count=32 .Dl fdisk -BI da0 |