svn commit: r274216 - stable/10/usr.sbin/bsdinstall

[Nathan Whitehorn]

Author: nwhitehorn
Date: Fri Nov  7 04:11:43 2014
New Revision: 274216
URL: https://svnweb.freebsd.org/changeset/base/274216

Log:
  MFC r273922:
  Rewrite some of the disk setup documentation to be clearer and contain
  less obsolete information. Also move the entropy command down the list --
  the list is ordered by likelihood of use rather than alphabetically.

Modified:
  stable/10/usr.sbin/bsdinstall/bsdinstall.8
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.sbin/bsdinstall/bsdinstall.8
==============================================================================
--- stable/10/usr.sbin/bsdinstall/bsdinstall.8	Fri Nov  7 03:36:28 2014	(r274215)
+++ stable/10/usr.sbin/bsdinstall/bsdinstall.8	Fri Nov  7 04:11:43 2014	(r274216)
@@ -25,7 +25,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd October 15, 2013
+.Dd October 31, 2014
 .Dt BSDINSTALL 8
 .Os
 .Sh NAME
@@ -73,10 +73,6 @@ targets.
 .Bl -tag -width ".Cm jail Ar destination"
 .It Cm auto
 Run the standard interactive installation, including disk partitioning.
-.It Cm entropy
-Reads a small amount of data from
-.Pa /dev/random
-and stores it in a file in the new system's root directory.
 .It Cm jail Ar destination
 Sets up a new chroot system at
 .Pa destination ,
@@ -119,32 +115,28 @@ If
 is set, also configures the network interfaces of the current system to match.
 .It Cm autopart
 Provides the installer's interactive guided disk partitioner for single-disk
-installations. Partitions disks, runs
-.Xr newfs 8 ,
-and writes the new system's
-.Pa fstab .
+installations. Defaults to UFS.
 .It Cm zfsboot
-Provides the installer's
-.Pq experimental
-interactive/scriptable ZFS partitioner for multi-disk installations.
+Provides an alternative ZFS-only automatic interactive disk partitioner.
 Creates a single
 .Ic zpool
-with datasets and writes to the new system's
-.Pa rc.conf ,
-.Pa loader.conf ,
+with separate datasets for
+.Pa /tmp ,
+.Pa /usr ,
+.Pa /usr/home ,
+.Pa /usr/ports ,
+.Pa /usr/src ,
 and
-.Pa fstab .
-Supports
-.Xr geli 8 ,
-.Xr gnop 8 ,
-and many other features.
+.Pa /var .
+Optionally can set up
+.Xr geli 8 
+to encrypt the disk.
 .It Cm partedit
-Provides the installer's interactive manual disk partitioner, with support
-for multi disk setups, non-UFS file systems, and manual selection of
-partition schemes. Partitions disks, runs
-.Xr newfs 8 ,
-and writes the new system's
-.Pa fstab .
+Provides the installer's interactive manual disk partitioner with an interface
+identical to
+.Xr sade 8 .
+Supports multiple disks as well as UFS, ZFS, and FAT file systems. ZFS
+is set up with one pool and dataset per partition.
 .It Cm scriptedpart Ar parameters
 Sets up disks like
 .Cm autopart
@@ -190,13 +182,19 @@ keyword causes the partition to take all
 .Ar type
 option chooses the
 .Xr gpart 8
-filesystem type (e.g. freebsd-ufs or freebsd-swap).
+filesystem type (e.g. freebsd-ufs, freebsd-zfs, or freebsd-swap).
 The optional
 .Ar mount point
 argument sets where the created partition is to be mounted in the installed
 system. As an example, a typical invocation looks like:
 .Pp
 bsdinstall scriptedpart ada0 { 20G freebsd-ufs /, 4G freebsd-swap, 20G freebsd-ufs /var, auto freebsd-ufs /usr }
+.Pp
+A shorter invocation to use the default partitioning (as
+.Cm autopart
+would have used) on the same disk:
+.Pp
+bsdinstall scriptedpart ada0
 .It Cm mount
 Mounts the file systems previously configured by
 .Cm autopart ,
@@ -235,6 +233,10 @@ Interactively sets the time, date, and t
 Queries the user for the system daemons to begin at system startup,
 writing the result into the new system's
 .Pa rc.conf .
+.It Cm entropy
+Reads a small amount of data from
+.Pa /dev/random
+and stores it in a file in the new system's root directory.
 .It Cm config
 Installs the configuration files destined for the new system (e.g. rc.conf
 fragments generated by
@@ -346,14 +348,14 @@ which is passed to the
 .Cm scriptedpart
 target to control disk setup.
 Alternatively,
+to use
+.Cm zfsboot
 instead of
-.Ev PARTITIONS ,
+.Cm partedit ,
 the preamble can contain the variable
 .Ev ZFSBOOT_DATASETS
-which is parsed by the
-.Pq experimental
-.Cm zfsboot
-target to control ZFS datasets/options of the boot pool setup.
+instead of 
+.Ev PARTITIONS .
 .Ss SETUP SCRIPT
 Following the preamble is an optional shell script, beginning with a #!
 declaration. This script will be run at the end of the installation process