diff --git a/en_US.ISO8859-1/books/handbook/Makefile b/en_US.ISO8859-1/books/handbook/Makefile index 56b026ff52..92d3c83f4d 100644 --- a/en_US.ISO8859-1/books/handbook/Makefile +++ b/en_US.ISO8859-1/books/handbook/Makefile @@ -56,6 +56,7 @@ IMAGES_EN+= bsdinstall/bsdinstall-distfile-verifying.png IMAGES_EN+= bsdinstall/bsdinstall-final-confirmation.png IMAGES_EN+= bsdinstall/bsdinstall-finalconfiguration.png IMAGES_EN+= bsdinstall/bsdinstall-final-modification-shell.png +IMAGES_EN+= bsdinstall/bsdinstall-keymap-10.png IMAGES_EN+= bsdinstall/bsdinstall-keymap-select-default.png IMAGES_EN+= bsdinstall/bsdinstall-mainexit.png IMAGES_EN+= bsdinstall/bsdinstall-netinstall-files.png @@ -73,6 +74,14 @@ IMAGES_EN+= bsdinstall/bsdinstall-timezone-confirm.png IMAGES_EN+= bsdinstall/bsdinstall-timezone-country.png IMAGES_EN+= bsdinstall/bsdinstall-timezone-region.png IMAGES_EN+= bsdinstall/bsdinstall-timezone-zone.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-disk_info.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-disk_select.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-geli_password.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-menu.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-partmenu.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-vdev_invalid.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-vdev_type.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-warning.png IMAGES_EN+= geom/striping.pic IMAGES_EN+= install/adduser1.scr IMAGES_EN+= install/adduser2.scr diff --git a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml index 3be327edbe..811f34b889 100644 --- a/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml @@ -54,6 +54,17 @@ + + + + + Allan + Jude + + + Updated for root-on-ZFS by + + @@ -159,7 +170,8 @@ &intel; EM64T architecture. Examples of these processors include the &intel; &core; 2 Duo, Quad, Extreme processor families, the &intel; &xeon; 3000, - 5000, and 7000 sequences of processors, and the + 5000, and 7000 sequences of processors, the + &intel; &xeon; E3, E5 and E7 processors, and the &intel; &core; i3, i5 and i7 processors. If you have a machine based on an nVidia nForce3 @@ -1056,6 +1068,23 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]... ISO-8859-1 is also a safe option if the choice of keymap is not clear. + + In &os; 10.0-RELEASE and later, this menu has been + enhanced. The full selection of keymaps is shown, with the + default preselected. In addition, when selecting a different + keymap, a dialog is displayed that allows the user to try + the keymap and ensure it is correct before proceeding. + +
+ Enhanced Keymap Menu + + + + + + +
+ @@ -1213,16 +1242,19 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]... Allocating Disk Space - There are three ways to allocate disk space for &os;. + There are four ways to allocate disk space for &os;. Guided partitioning automatically sets up disk partitions, while Manual partitioning - allows advanced users to create customized partitions. Finally, + allows advanced users to create customized partitions. The + ZFS option, only available in &os; 10 and + later, will create an optionally encrypted root-on-ZFS system + with support for Boot Environments. Finally, there's the option of starting a shell where command-line programs like &man.gpart.8;, &man.fdisk.8;, and &man.bsdlabel.8; can be used directly.
- Selecting Guided or Manual Partitioning + Selecting Guided, Manual or Shell Partitioning @@ -1232,6 +1264,17 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]...
+
+ Selecting Guided, Manual, Shell or + <acronym>ZFS</acronym> Partitioning + + + + + + +
+ This section describes what to consider when laying out the disk partitions. It then demonstrates how to use both the Guided Partitioning and Manual Partitioning screens. @@ -1525,7 +1568,7 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]... Another partition type worth noting is freebsd-zfs, used for partitions that will - contain a &os; ZFS filesystem. See + contain a &os; ZFS filesystem. See . &man.gpart.8; shows more of the available GPT partition types. @@ -1662,6 +1705,174 @@ Trying to mount root from cd9660:/dev/iso9660/FREEBSD_INSTALL [ro]... [ Finish ] to continue with the installation. + + + Root-on-ZFS Automatic Partitioning + + Support for automatic creation of root-on-ZFS + installations was added in &os; 10.0-RELEASE. This + partitioning mode only works with whole disks and will erase + the contents of the entire disk. The installer will + automatically create partitions aligned to 4k boundaries, as + well as force ZFS to use 4k sectors. This + is safe even with 512 byte sector disks, and has the added + benefit of ensuring that pools created on 512 byte disks will + be able to have 4k sector disks added to them in the future, + for additional storage space, or as replacements for failed + disks. The installer can also optionally employ GELI disk encryption. + If encryption is enabled, a 2 GB unencrypted boot pool is + created that contains the /boot + directory, which holds the kernel and other files necessary + to boot the system. A swap partition of a user selectable + size is also created, and all remaining space is used for the + ZFS pool. + + The main ZFS menu in the installer + offers a number of options to control the creation of the + pool. + +
+ <acronym>ZFS</acronym> Partitioning Menu + + + + + + +
+ + The most important option is selecting the vdev type + and one or more disks that will make up the vdev that will + constitute the pool. The automatic ZFS + installer currently only supports the creation of a single + top level vdev, except in stripe mode. To create more complex + pools, use Shell Mode to create + the pool. The installer supports the creation of various + pool types, including stripe (not recommended, no redundancy), + mirror (best performance, least usable space), and RAID-Z 1, + 2, and 3 (with the capability to withstand the concurrent + failure of 1, 2, and 3 disks, respectively). A tooltip across + the bottom of the screen while selecting the pool type + provides advice about the number of required disks for each + type, and in the case of RAID-Z, the optimal number of disks + for each configuration. + +
+ <acronym>ZFS</acronym> Pool Type + + + + + + +
+ + Once a pool type has been selected, a list of available + disks is displayed, and the user is prompted to select one or + more disks to make up the pool. The configuration is then + validated, to ensure enough disks were selected. If not, + select <Change Selection> to + return to the list of disks, or + <Cancel> to change the pool + type. + +
+ Disk Selection + + + + + + +
+ +
+ Invalid Selection + + + + + + +
+ + If one or more disks are missing from the list, or if disks + were attached after the installer was started, select + - Rescan Devices to repopulate the list + of available disks. To ensure that the correct disk is + selected, so as not to accidently destroy the wrong disks, the + - Disk Info menu allows you to inspect + each disk, including its partition table, and various other + information, including the device model number and serial + number, if available. + +
+ Analysing a Disk + + + + + + +
+ + The menu also allows the user to enter a name for the + pool, disable forcing 4k sectors, enable or disable + encryption, switch between GPT (recommended) and MBR partition + table types, and select the desired amount of swap + space. Once all options have been set to the desired values, + select the >>> Install + option at the top of the menu. + + If &man.geli.8; disk encryption was enabled, the + installer will prompt twice for the passphrase to be + used to encrypt the disks. + +
+ Disk Encryption Password + + + + + + +
+ + The installer then offers a last chance to cancel before + the contents of the selected drives are destroyed to create + the ZFS pool. + +
+ Last Chance + + + + + + +
+ + The installation then proceeds normally. + + + + + Shell Mode Partitioning + + When creating advanced installations the basic interface + of bsdinstall may not provide the level of flexibility + required. Selecting the Shell option + from the partitioning menu will drop the user to a shell. The + user is expected to partition the drives and create the + desired file system(s), populate an &man.fstab.5; file in + /tmp/bsdinstall_etc/fstab, and mount the + file systems under /mnt. Once this is + done, running exit will return to + bsdinstall and continue the installation, starting with the + extraction of the distribution sets. + diff --git a/en_US.ISO8859-1/books/handbook/disks/chapter.xml b/en_US.ISO8859-1/books/handbook/disks/chapter.xml index 249361efa7..bbecdb7786 100644 --- a/en_US.ISO8859-1/books/handbook/disks/chapter.xml +++ b/en_US.ISO8859-1/books/handbook/disks/chapter.xml @@ -2971,7 +2971,7 @@ gbde_lockdir="/etc/gbde" - + Disk Encryption with <command>geli</command> diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_info.png b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_info.png new file mode 100644 index 0000000000..ec4ada9c60 Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_info.png differ diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_select.png b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_select.png new file mode 100644 index 0000000000..6829d62a68 Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-disk_select.png differ diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-zfs-geli_password.png b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-geli_password.png new file mode 100644 index 0000000000..b54405200a Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-geli_password.png differ diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-zfs-menu.png b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-menu.png new file mode 100644 index 0000000000..c924719eb1 Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-menu.png differ diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-zfs-partmenu.png b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-partmenu.png new file mode 100644 index 0000000000..1292b8cc9c Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-partmenu.png differ diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_invalid.png b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_invalid.png new file mode 100644 index 0000000000..b2d9a1eab7 Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_invalid.png differ diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_type.png b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_type.png new file mode 100644 index 0000000000..f025897fa1 Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-vdev_type.png differ diff --git a/share/images/books/handbook/bsdinstall/bsdinstall-zfs-warning.png b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-warning.png new file mode 100644 index 0000000000..eac97b5f00 Binary files /dev/null and b/share/images/books/handbook/bsdinstall/bsdinstall-zfs-warning.png differ