Index: head/en_US.ISO8859-1/books/handbook/Makefile =================================================================== --- head/en_US.ISO8859-1/books/handbook/Makefile +++ head/en_US.ISO8859-1/books/handbook/Makefile @@ -96,6 +96,10 @@ 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+= bsdinstall/bsdinstall-zfs-rescan-devices.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-pool-name.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-swap-amount.png +IMAGES_EN+= bsdinstall/bsdinstall-zfs-init-encription.png IMAGES_EN+= geom/striping.pic IMAGES_EN+= mail/mutt1.scr IMAGES_EN+= mail/mutt2.scr Index: head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml =================================================================== --- head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml +++ head/en_US.ISO8859-1/books/handbook/bsdinstall/chapter.xml @@ -1659,30 +1659,11 @@ Guided Partitioning Using Root-on-ZFS - 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 and - 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 in the future, either as additional - storage space or as replacements for failed disks. The - installer can also optionally employ GELI - disk encryption as described in . - If encryption is enabled, a 2 GB unencrypted boot pool - containing the /boot directory is - created. It 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. + This partitioning mode only works with whole disks and + will erase the contents of the entire disk. The main + ZFS configuration menu offers a number of + options to control the creation of the pool. - The main ZFS configuration menu offers - a number of options to control the creation of the - pool. -
<acronym>ZFS</acronym> Partitioning Menu @@ -1693,22 +1674,97 @@
+ Here is a summary of the options which can be used in + this menu: + + + + Install - Proceed with the + installation with the selected options. + + + + Pool Type/Disks - Allow to configure + the Pool Type and the disk(s) 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 the instructions in + to create the pool. + + + + Rescan Devices - Repopulate the list + of available disks. + + + + Disk Info - Disk Info menu can be + used to inspect each disk, including its partition table and + various other information such as the device model number + and serial number, if available. + + + + Pool Name - Establish the name of the + pool. The default name is + zroot. + + + + Force 4K Sectors? - Force the use of + 4K sectors. By default, the installer will automatically + create partitions aligned to 4K boundaries and 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 in the future, either as additional storage + space or as replacements for failed disks. Press the + Enter key to chose to activate it or + not. + + + + Encrypt Disks? - Encrypting the disks + allows the user to encrypt the disks using + GELI. More information about disk + encryption is available in . + Press the Enter key to chose activate it or + not. + + + + Partition Scheme - Allow to choose + the partition scheme. GPT is the recommended option in + most cases. Press the Enter key to chose + between the different options. + + + + Swap Size - Establish the amount of + swap space. + + + + Mirror Swap? - Allows the user to + mirror the swap between the disks. Be aware, enabling + mirror swap will break crash dumps. Press the + Enter key to activate it or not. + + + + Encrypt Swap? - Allow the user the + possibility to encrypt the swap. Encrypts the swap with a + temporary key each time that the system boots and discards + it on reboot. Press the Enter key to chose + activate it or not. More information about swap encryption + in . + + + Select T to configure the Pool - Type and the disk(s) 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 the instructions in 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). While selecting the pool type, - a tooltip is displayed across the bottom of the screen with - advice about the number of required disks, and in the case of - RAID-Z, the optimal number of disks for each - configuration. + Type and the disk(s) that will constitute the + pool.
<acronym>ZFS</acronym> Pool Type @@ -1720,14 +1776,55 @@
+ Here is a summary of the Pool Type + which can be selected in this menu: + + + + stripe - Striping provides maximum + storage of all connected devices, but no redundancy. If + just one disk fails the data on the pool is lost + irrevocably. + + + mirror - Mirroring stores a complete + copy of all data on every disk. Mirroring provides a good + read perfomance because data is read from all disks in + parallel. Write performance is slower as the data must be + written to all disks in the pool. Allows all but one disk + to fail. This options requires at least two disks. + + + raid10 - Striped mirrors. Provides + the best performance, but the least storage. This option + needs at least an even number of disks and a minimum of four + disks. + + + raidz1 - Single Redundant RAID. + Allow one disk to fail concurrently. This option needs at + least three disks. + + + raidz2 - Double Redundant RAID. + Allows two disks to fail concurrently. This option needs + at least four disks. + + + raidz3 - Triple Redundant RAID. + Allows three disks to fail concurrently. This option needs + at least five disks. + + + 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 are selected. If not, select <Change - Selection> to return to the list of disks, or - <Cancel> to change the pool - type. + Selection> to return to the list of disks, or + <Back> to change the + Pool Type.
Disk Selection @@ -1754,8 +1851,19 @@ 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 avoid accidentally erasing the wrong disk, the + of available disks. + +
+ Rescan Devices + + + + + + +
+ + To avoid accidentally erasing the wrong disk, the - Disk Info menu can be used to inspect each disk, including its partition table and various other information such as the device model number and serial number, @@ -1771,19 +1879,59 @@
- The main ZFS configuration menu also - allows the user to enter a pool name, disable forcing 4k - sectors, enable or disable encryption, switch between - GPT (recommended) and - MBR partition table types, and select the - amount of swap space. Once all options have been set to the - desired values, select the - >>> Install option at the - top of the menu. + Select N to configure the + Pool Name. Enter the desired name then + select <OK> to establish it or + <Cancel> to return to the + main menu and leave the default name. +
+ Pool Name + + + + + + +
+ + Select S to set the amount of + swap. Enter the desired amount of swap and then select + <OK> to establish it or + <Cancel> to return to the + main menu and let the default amount. + +
+ Swap Amount + + + + + + +
+ + Once all options have been set to the desired values, + select the >>> Install + option at the top of the menu. 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 + + + + + + +
+ If GELI disk encryption was enabled, the installer will prompt twice for the passphrase to be used - to encrypt the disks. + to encrypt the disks. And after that the initializing of the + encryption begins.
Disk Encryption Password @@ -1795,22 +1943,21 @@
+ +
+ Initializing Encryption - 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. + The installation then proceeds normally. To continue + with the installation go to + .