From owner-freebsd-doc@FreeBSD.ORG Tue Mar 18 00:20:00 2014 Return-Path: Delivered-To: freebsd-doc@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A8A78D62 for ; Tue, 18 Mar 2014 00:20:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 7FB38D62 for ; Tue, 18 Mar 2014 00:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s2I0K0JY065954 for ; Tue, 18 Mar 2014 00:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s2I0K0rO065953; Tue, 18 Mar 2014 00:20:00 GMT (envelope-from gnats) Resent-Date: Tue, 18 Mar 2014 00:20:00 GMT Resent-Message-Id: <201403180020.s2I0K0rO065953@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-doc@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Allan Jude Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 719B3BFB for ; Tue, 18 Mar 2014 00:11:28 +0000 (UTC) Received: from cgiserv.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5D9B1D0C for ; Tue, 18 Mar 2014 00:11:28 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by cgiserv.freebsd.org (8.14.8/8.14.8) with ESMTP id s2I0BSEL070996 for ; Tue, 18 Mar 2014 00:11:28 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.8/8.14.8/Submit) id s2I0BS6u070992; Tue, 18 Mar 2014 00:11:28 GMT (envelope-from nobody) Message-Id: <201403180011.s2I0BS6u070992@cgiserv.freebsd.org> Date: Tue, 18 Mar 2014 00:11:28 GMT From: Allan Jude To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: docs/187686: [patch] Update disks section of handbook for 9.x/10.x X-BeenThere: freebsd-doc@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Documentation project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Mar 2014 00:20:00 -0000 >Number: 187686 >Category: docs >Synopsis: [patch] Update disks section of handbook for 9.x/10.x >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-doc >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Tue Mar 18 00:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Allan Jude >Release: 9.2-RELEASE >Organization: ScaleEngine Inc. >Environment: FreeBSD Trooper.HML3.ScaleEngine.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Thu Sep 26 22:50:31 UTC 2013 root@bake.isc.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: The disks section of the handbook is full of examples based on the FreeBSD 8.x and prior disk laying (MBR/BSD with separate partitions for / /tmp /usr /var) and the old device names (ad4 instead of ada1) Updated the docs for all of that, and also added a lot of markup: acronym, replaceable, changed some incorrect literal to filename (for device names), etc. Added 'mfi' to the RAID list since it is the most popular controller now Updated the USB instructions to mention USB 3.0 and xhci Added some missing xml:id to allow cross referencing the GELI section from the installer section etc. >How-To-Repeat: >Fix: Patch Attached Patch attached with submission follows: Index: head/en_US.ISO8859-1/books/handbook/disks/chapter.xml =================================================================== --- head/en_US.ISO8859-1/books/handbook/disks/chapter.xml (revision 44203) +++ head/en_US.ISO8859-1/books/handbook/disks/chapter.xml (working copy) @@ -14,9 +14,9 @@ Synopsis - This chapter covers the use of disks in &os;. This includes - memory-backed disks, network-attached disks, standard SCSI/IDE - storage devices, and devices using the USB interface. + This chapter covers the configuration and use of disks in &os;. This includes + memory-backed disks, network-attached disks, standard SCSI/IDE and SATA + storage devices, and removable devices using the USB interface. After reading this chapter, you will know: @@ -23,7 +23,7 @@ The terminology &os; uses to describe the organization - of data on a physical disk. + of data on a physical or logical disk. @@ -32,7 +32,7 @@ - How to configure &os; to use USB storage devices. + How to configure &os; to use USB storage devices. @@ -93,75 +93,76 @@ - IDE hard drives - ad or - ada + IDE hard drives + ad or + ada - IDE CD-ROM drives - acd or - cd + IDE CD-ROM drives + acd or + cd - SATA hard drives - ad or - ada + SATA hard drives + ad or + ada - SATA CD-ROM drives - acd or - cd + SATA CD-ROM drives + acd or + cd - SCSI hard drives and USB Mass storage + SCSI hard drives and USB Mass storage devices - da + da - SCSI CD-ROM drives - cd + SCSI CD-ROM drives + cd Assorted non-standard CD-ROM drives - mcd for Mitsumi CD-ROM and - scd for Sony CD-ROM devices + mcd for Mitsumi CD-ROM and + scd for Sony CD-ROM devices Floppy drives - fd + fd - SCSI tape drives - sa + SCSI tape drives + sa - IDE tape drives - ast + IDE tape drives + ast Flash drives - fla for &diskonchip; Flash + fla for &diskonchip; Flash device RAID drives - aacd for &adaptec; AdvancedRAID, - mlxd and mlyd + aacd for &adaptec; AdvancedRAID, + mlxd and mlyd for &mylex;, - amrd for AMI &megaraid;, - idad for Compaq Smart RAID, - twed for &tm.3ware; RAID. + amrd for AMI &megaraid;, + idad for Compaq Smart RAID, + twed for &tm.3ware; RAID, + mfid for &lsilogic; &megaraid;. @@ -402,7 +403,7 @@ - USB Storage Devices + <acronym>USB</acronym> Storage Devices @@ -420,52 +421,44 @@ disks - Many external storage solutions, such as hard drives, USB + Many external storage solutions, such as hard drives, USB thumbdrives, and CD/DVD burners, use the Universal Serial Bus - (USB). &os; provides support for these devices. + (USB). &os; provides support for these devices. Configuration - The USB mass storage devices driver, &man.umass.4;, is + The USB mass storage devices driver, &man.umass.4;, is built into the GENERIC kernel and - provides support for USB storage devices. For a custom + provides support for USB storage devices. For a custom kernel, be sure that the following lines are present in the kernel configuration file: - device scbus -device da -device pass -device uhci -device ohci -device ehci -device usb -device umass + device scbus # SCSI bus (required for ATA/SCSI) +device da # Direct Access (disks) +device cd # CD +device pass # Passthrough device (direct ATA/SCSI access) +device uhci # UHCI PCI->USB interface +device ohci # OHCI PCI->USB interface +device ehci # EHCI PCI->USB interface (USB 2.0) +device xhci # XHCI PCI->USB interface (USB 3.0) +device usb # USB Bus (required) +device umass # Disks/Mass storage - Requires scbus and da - Since the &man.umass.4; driver uses the SCSI subsystem to - access the USB storage devices, any USB device will be seen as - a SCSI device by the system. Depending on the USB chipset on + Since the &man.umass.4; driver uses the SCSI subsystem to + access the USB storage devices, any USB device will be seen as + a SCSI device by the system. Depending on the USB chipset on the motherboard, device uhci or - device ohci is used to provide USB 1.X - support. Support for USB 2.0 controllers is provided by - device ehci. - - - If the USB device is a CD or DVD burner, &man.cd.4;, - must be added to the kernel via the line: - - device cd - - Since the burner is seen as a SCSI drive, the driver - &man.atapicam.4; should not be used in the kernel - configuration. - + device ohci is used to provide USB 1.X + support. Support for USB 2.0 controllers is provided by + device ehci and USB 3.0 + by xhci. Testing the Configuration - To test the USB configuration, plug in the USB device. In + To test the USB configuration, plug in the USB device. In the system message buffer, &man.dmesg.8;, the drive should appear as something like: @@ -479,8 +472,8 @@ The brand, device node (da0), and other details will differ according to the device. - Since the USB device is seen as a SCSI one, - camcontrol can be used to list the USB + Since the USB device is seen as a SCSI device, + camcontrol can be used to list the USB storage devices attached to the system: &prompt.root; camcontrol devlist @@ -488,7 +481,7 @@ If the drive comes with a file system, it can be mounted. Refer to for - instructions on how to format and create partitions on the USB + instructions on how to format and create partitions on the USB drive. @@ -511,24 +504,24 @@ add path 'da*' mode 0660 group operator - If SCSI disks are installed in the system, change + If SCSI disks are installed in the system, change the second line as follows: add path 'da[3-9]*' mode 0660 group operator - This will exclude the first three SCSI disks - (da0 to - da2)from belonging to the + This will exclude the first three SCSI disks + (da0 through + da2) from belonging to the operator group. - Next, enable the &man.devfs.rules.5; ruleset in + Enable the &man.devfs.rules.5; ruleset in /etc/rc.conf: devfs_system_ruleset="localrules" - Next, instruct the running kernel to allow regular users + Instruct the running kernel to allow regular users to mount file systems. The easiest way is to add the following line to /etc/sysctl.conf: @@ -551,7 +544,7 @@ &prompt.root; mkdir /mnt/username &prompt.root; chown username:usergroup /mnt/username - Suppose a USB thumbdrive is plugged in, and a device + Suppose a USB thumbdrive is plugged in, and a device /dev/da0s1 appears. If the device is preformatted with a FAT file system, it can be mounted using: @@ -646,13 +639,13 @@ Which tool to use to burn the CD depends on whether the - CD burner is ATAPI or something else. ATAPI CD burners use + CD burner is ATAPI or something else. ATAPI CD burners use burncd which is part of the base system. - SCSI and USB CD burners should use cdrecord + SCSI and USB CD burners should use cdrecord from the sysutils/cdrtools port. It is also possible to use cdrecord and other - tools for SCSI drives on ATAPI hardware with the - ATAPI/CAM module. + tools for SCSI drives on ATAPI hardware with the + ATAPI/CAM module. For CD burning software with a graphical user interface, consider X-CD-Roast or @@ -661,7 +654,7 @@ sysutils/k3b ports. X-CD-Roast and K3b require the - ATAPI/CAM module with ATAPI + ATAPI/CAM module with ATAPI hardware. @@ -755,7 +748,7 @@ CD-ROMs burning - For an ATAPI CD burner, burncd can be + For an ATAPI CD burner, burncd can be used to burn an ISO image onto a CD. burncd is part of the base system, installed as /usr/sbin/burncd. Usage is @@ -774,7 +767,7 @@ <application>cdrecord</application> - For systems without an ATAPI CD burner, + For systems without an ATAPI CD burner, cdrecord can be used to burn CDs. cdrecord is not part of the base system and must be installed from either the @@ -838,11 +831,11 @@ To duplicate an audio CD, extract the audio data from the CD to a series of files, then write these files to a blank CD. - The process is slightly different for ATAPI and SCSI + The process is slightly different for ATAPI and SCSI drives. - SCSI Drives + <acronym>SCSI</acronym> Drives Use cdda2wav to extract the @@ -864,12 +857,12 @@ - ATAPI Drives + <acronym>ATAPI</acronym> Drives With the help of the - ATAPI/CAM module, - cdda2wav can also be used on ATAPI + ATAPI/CAM module, + cdda2wav can also be used on ATAPI drives. This tool is usually a better choice for most of users, as it supports jitter correction and endianness, than the method proposed below. @@ -876,7 +869,7 @@ - The ATAPI CD driver makes each track available as + The ATAPI CD driver makes each track available as /dev/acddtnn, where d is the drive number, and nn is the track number @@ -941,7 +934,7 @@ will generate an error about Incorrect super block, and will fail to mount the CD. The CD - does not use the UFS file system, so + does not use the UFS file system, so attempts to mount it as such will fail. Instead, tell &man.mount.8; that the file system is of type ISO9660 by specifying @@ -950,7 +943,7 @@ under /mnt, use: - &prompt.root; mount -t cd9660 /dev/cd0 /mnt + &prompt.root; mount -t cd9660 /dev/cd0 /mnt Replace /dev/cd0 with the device name for the CD device. Also, @@ -989,7 +982,7 @@ It can take a couple of seconds for a CD-ROM drive to realize that a media is present, so be patient. - Sometimes, a SCSI CD-ROM may be missed because it did not + Sometimes, a SCSI CD-ROM may be missed because it did not have enough time to answer the bus reset. To resolve this, add the following option to the kernel configuration and rebuild the @@ -997,7 +990,7 @@ options SCSI_DELAY=15000 - This tells the SCSI bus to pause 15 seconds during boot, + This tells the SCSI bus to pause 15 seconds during boot, to give the CD-ROM drive every possible chance to answer the bus reset. @@ -1026,7 +1019,7 @@ - Using the ATAPI/CAM Driver + Using the <acronym>ATAPI</acronym>/<acronym>CAM</acronym> Driver @@ -1041,11 +1034,11 @@ CD burner - ATAPI/CAM driver + ATAPI/CAM driver - This driver allows ATAPI devices, such as CD/DVD drives, - to be accessed through the SCSI subsystem, and so allows the + This driver allows ATAPI devices, such as CD/DVD drives, + to be accessed through the SCSI subsystem, and so allows the use of applications like sysutils/cdrdao or &man.cdrecord.1;. @@ -1092,17 +1085,17 @@ &prompt.root; mount -t cd9660 /dev/cd0 /mnt As root, run the - following command to get the SCSI address of the + following command to get the SCSI address of the burner: &prompt.root; camcontrol devlist <MATSHITA CDRW/DVD UJDA740 1.00> at scbus1 target 0 lun 0 (pass0,cd0) - In this example, 1,0,0 is the SCSI - address to use with &man.cdrecord.1; and other SCSI + In this example, 1,0,0 is the SCSI + address to use with &man.cdrecord.1; and other SCSI applications. - For more information about ATAPI/CAM and SCSI system, + For more information about ATAPI/CAM and SCSI system, refer to &man.atapicam.4; and &man.cam.4;. @@ -1205,14 +1198,14 @@ sysutils/dvd+rw-tools utilities which support all DVD media types. - These tools use the SCSI subsystem to access the devices, - therefore ATAPI/CAM support + These tools use the SCSI subsystem to access the devices, + therefore ATAPI/CAM support must be loaded or statically compiled into the kernel. This - support is not needed if the burner uses the USB interface. + support is not needed if the burner uses the USB interface. Refer to for more details - on USB device configuration. + on USB device configuration. - DMA access must also be enabled for ATAPI devices, by + DMA access must also be enabled for ATAPI devices, by adding the following line to /boot/loader.conf: @@ -1516,8 +1509,8 @@ Configuration - DVD-RAM writers can use either a SCSI or ATAPI - interface. For ATAPI devices, DMA access has to be + DVD-RAM writers can use either a SCSI or ATAPI + interface. For ATAPI devices, DMA access has to be enabled by adding the following line to /boot/loader.conf: @@ -1613,7 +1606,7 @@ The floppy is now ready to be high-level formatted with - a file system. The floppy's file system can be either UFS + a file system. The floppy's file system can be either UFS or FAT, where FAT is generally a better choice for floppies. @@ -1638,8 +1631,8 @@ to be used in a modern system. Modern backup systems tend to use off site combined with local removable disk drive technologies. Still, &os; will support any tape drive that - uses SCSI, such as LTO and older devices such as DAT. There is - limited support for SATA and USB tape drives. + uses SCSI, such as LTO and older devices such as DAT. There is + limited support for SATA and USB tape drives. Serial Access with &man.sa.4; @@ -1777,7 +1770,7 @@ Typically, a mix of backup techniques is used. For example, one could create a schedule to automate a weekly, full system backup that is stored off-site and to supplement this - backup with hourly ZFS snapshots. In addition, one could make a + backup with hourly ZFS snapshots. In addition, one could make a manual backup of individual directories or files before making file edits or deletions. @@ -1857,7 +1850,7 @@ This example sets RSH in order to write the - the backup to a tape drive on a remote system over a + backup to a tape drive on a remote system over a SSH connection: @@ -1896,7 +1889,7 @@ same directory that is being backed up. - Backing Up the Current Directory With + <title>Backing Up the Current Directory with <command>tar</command> &prompt.root; tar czvf /tmp/mybackup.tgz . @@ -1910,7 +1903,7 @@ backup to restore. - Restoring Up the Current Directory With + <title>Restoring Up the Current Directory with <command>tar</command> &prompt.root; tar xzvf /tmp/mybackup.tgz @@ -1968,7 +1961,7 @@ examples would be: - Backing Up the Current Directory With + <title>Backing Up the Current Directory with <command>pax</command> &prompt.root; pax -wf /tmp/mybackup.pax . @@ -2158,7 +2151,7 @@ While &man.mdconfig.8; is useful, it takes several command lines to create a file-backed file system. &os; also comes with &man.mdmfs.8; which automatically configures a - &man.md.4; disk using &man.mdconfig.8;, puts a UFS file system + &man.md.4; disk using &man.mdconfig.8;, puts a UFS file system on it using &man.newfs.8;, and mounts it using &man.mount.8;. For example, to create and mount the same file system image as above, type the following: @@ -2273,11 +2266,11 @@ snapshots - &os; offers a feature in conjunction with + &os; offers a feature in conjunction with UFS Soft Updates: file system snapshots. - UFS snapshots allow a user to create images of specified + UFS snapshots allow a user to create images of specified file systems, and treat them as a file. Snapshot files must be created in the file system that the action is performed on, and a user may create no more than 20 snapshots per file system. @@ -2285,8 +2278,8 @@ persistent across unmount and remount operations along with system reboots. When a snapshot is no longer required, it can be removed using &man.rm.1;. While snapshots may be removed in - any order, all the used space may not be acquired because - another snapshot will possibly claim some of the released + any order, all the used space may not be reclaimed because + another snapshot will possibly still be using some of the blocks. The un-alterable file flag is set @@ -2656,7 +2649,7 @@ systems. No cleartext ever touches the hard drive's platter. - + Disk Encryption with <application>gbde</application> @@ -2702,14 +2695,13 @@ Install the new drive to the system as explained in . For the purposes of this example, a new hard drive partition has been - added as /dev/ad4s1c and - /dev/ad0s1* + added as /dev/ada1p1 and + /dev/ada0* represents the existing standard &os; partitions. - &prompt.root; ls /dev/ad* -/dev/ad0 /dev/ad0s1b /dev/ad0s1e /dev/ad4s1 -/dev/ad0s1 /dev/ad0s1c /dev/ad0s1f /dev/ad4s1c -/dev/ad0s1a /dev/ad0s1d /dev/ad4 + &prompt.root; ls /dev/ada* +/dev/ada0 /dev/ada0p2 /dev/ada1 +/dev/ada0p1 /dev/ada0p3 /dev/ada1p1 @@ -2737,7 +2729,7 @@ initialized before it can be used. This initialization needs to be performed only once: - &prompt.root; gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock + &prompt.root; gbde init /dev/ada1p1 -i -L /etc/gbde/ada1p1.lock &man.gbde.8; will open the default editor, in order to set various configuration options in a template. For @@ -2767,7 +2759,7 @@ gbde initcreates a lock file for the gbde partition. In this example, it is stored as - /etc/gbde/ad4s1c.lock. + /etc/gbde/ada1p1.lock. gbde lock files must end in .lock in order to be correctly detected by the /etc/rc.d/gbde start up @@ -2791,7 +2783,7 @@ Attach the Encrypted Partition to the Kernel - &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock + &prompt.root; gbde attach /dev/ada1p1 -l /etc/gbde/ada1p1.lock This command will prompt to input the passphrase that was selected during the initialization of the @@ -2800,10 +2792,9 @@ /dev as /dev/device_name.bde: - &prompt.root; ls /dev/ad* -/dev/ad0 /dev/ad0s1b /dev/ad0s1e /dev/ad4s1 -/dev/ad0s1 /dev/ad0s1c /dev/ad0s1f /dev/ad4s1c -/dev/ad0s1a /dev/ad0s1d /dev/ad4 /dev/ad4s1c.bde + &prompt.root; ls /dev/ada* +/dev/ada0 /dev/ada0p2 /dev/ada1 /dev/ada1p1.bde +/dev/ada0p1 /dev/ada0p3 /dev/ada1p1 @@ -2815,7 +2806,7 @@ &man.newfs.8;. This example creates a UFS2 file system with soft updates enabled. - &prompt.root; newfs -U /dev/ad4s1c.bde + &prompt.root; newfs -U /dev/ada1p1.bde &man.newfs.8; must be performed on an attached @@ -2836,7 +2827,7 @@ Mount the encrypted file system: - &prompt.root; mount /dev/ad4s1c.bde /private + &prompt.root; mount /dev/ada1p1.bde /private @@ -2848,12 +2839,9 @@ &prompt.user; df -H Filesystem Size Used Avail Capacity Mounted on -/dev/ad0s1a 1037M 72M 883M 8% / -/devfs 1.0K 1.0K 0B 100% /dev -/dev/ad0s1f 8.1G 55K 7.5G 0% /home -/dev/ad0s1e 1037M 1.1M 953M 0% /tmp -/dev/ad0s1d 6.1G 1.9G 3.7G 35% /usr -/dev/ad4s1c.bde 150G 4.1K 138G 0% /private +/dev/ada0p2 1037M 72M 883M 8% / +/devfs 1.0K 1.0K 0B 100% /dev +/dev/ada1p1.bde 150G 4.1K 138G 0% /private @@ -2872,7 +2860,7 @@ Attach the <command>gbde</command> Partition to the Kernel - &prompt.root; gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock + &prompt.root; gbde attach /dev/ada1p1 -l /etc/gbde/ada1p1.lock This command will prompt for the passphrase that was selected during initialization of the encrypted @@ -2887,13 +2875,13 @@ the file systems must be checked for errors by running &man.fsck.8; manually before mounting: - &prompt.root; fsck -p -t ffs /dev/ad4s1c.bde + &prompt.root; fsck -p -t ffs /dev/ada1p1.bde Mount the Encrypted File System - &prompt.root; mount /dev/ad4s1c.bde /private + &prompt.root; mount /dev/ada1p1.bde /private The encrypted file system is now available for use. @@ -2915,7 +2903,7 @@ &man.rc.conf.5;: gbde_autoattach_all="YES" -gbde_devices="ad4s1c" +gbde_devices="ada1p1" gbde_lockdir="/etc/gbde" This requires that the @@ -2950,12 +2938,12 @@ probing for devices. To detach the encrypted device used in the example, use the following command: - &prompt.root; gbde detach /dev/ad4s1c + &prompt.root; gbde detach /dev/ada1p1 - + Disk Encryption with <command>geli</command> @@ -3116,11 +3104,8 @@ &prompt.root; df -H Filesystem Size Used Avail Capacity Mounted on -/dev/ad0s1a 248M 89M 139M 38% / +/dev/ada0p2 248M 89M 139M 38% / /devfs 1.0K 1.0K 0B 100% /dev -/dev/ad0s1f 7.7G 2.3G 4.9G 32% /usr -/dev/ad0s1d 989M 1.5M 909M 0% /tmp -/dev/ad0s1e 3.9G 1.3G 2.3G 35% /var /dev/da2.eli 150G 4.1K 138G 0% /private @@ -3198,7 +3183,7 @@ passwords stay in physical memory, these passwords will not be written to disk and be cleared after a reboot. If &os; starts swapping out memory pages to free space for other applications, - the passwords may be written to the disk platters unencrypted. + the passwords may be written to disk unencrypted. Encrypting swap space can be a solution for this scenario. @@ -3209,7 +3194,7 @@ For the remainder of this section, - ad0s1b will be the swap + ada0p3 will be the swap partition. @@ -3218,7 +3203,7 @@ overwrite the current swap partition with random garbage, execute the following command: - &prompt.root; dd if=/dev/random of=/dev/ad0s1b bs=1m + &prompt.root; dd if=/dev/random of=/dev/ada0p3 bs=1m Swap Encryption with &man.gbde.8; @@ -3228,7 +3213,7 @@ line: # Device Mountpoint FStype Options Dump Pass# -/dev/ad0s1b.bde none swap sw 0 0 +/dev/ada0p3.bde none swap sw 0 0 @@ -3241,11 +3226,11 @@ line: # Device Mountpoint FStype Options Dump Pass# -/dev/ad0s1b.eli none swap sw 0 0 +/dev/ada0p3.eli none swap sw 0 0 &man.geli.8; uses the AES algorithm with a key length of 128 bit by default. These defaults can - be altered by using geli_swap_flags in + be altered by using geli_swap_flags in /etc/rc.conf. The following line tells the encswap rc.d script to create &man.geli.8; swap partitions using the Blowfish algorithm with @@ -3270,13 +3255,13 @@ &prompt.user; swapinfo Device 1K-blocks Used Avail Capacity -/dev/ad0s1b.bde 542720 0 542720 0% +/dev/ada0p3.bde 542720 0 542720 0% If &man.geli.8; is being used: &prompt.user; swapinfo Device 1K-blocks Used Avail Capacity -/dev/ad0s1b.eli 542720 0 542720 0% +/dev/ada0p3.eli 542720 0 542720 0% @@ -3897,9 +3882,9 @@ - For this example, a standard UFS file system was used. + For this example, a standard UFS file system was used. To reduce the time needed for recovery, a journal-enabled - UFS or ZFS file system can be used instead. + UFS or ZFS file system can be used instead. More detailed information with additional examples can Index: head/share/xml/trademarks.ent =================================================================== --- head/share/xml/trademarks.ent (revision 44203) +++ head/share/xml/trademarks.ent (working copy) @@ -183,6 +183,7 @@ LSI Logic, AcceleRAID, eXtremeRAID, MegaRAID and Mylex are trademarks or registered trademarks of LSI Logic Corp."> +LSI Logic Corp."> AcceleRAID"> MegaRAID"> Mylex"> >Release-Note: >Audit-Trail: >Unformatted: