From owner-svn-doc-all@FreeBSD.ORG Tue Jun 24 18:51:10 2014 Return-Path: Delivered-To: svn-doc-all@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 8B574153; Tue, 24 Jun 2014 18:51:10 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 76A192BCE; Tue, 24 Jun 2014 18:51:10 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s5OIpAOX082033; Tue, 24 Jun 2014 18:51:10 GMT (envelope-from wblock@svn.freebsd.org) Received: (from wblock@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s5OIpARD082032; Tue, 24 Jun 2014 18:51:10 GMT (envelope-from wblock@svn.freebsd.org) Message-Id: <201406241851.s5OIpARD082032@svn.freebsd.org> From: Warren Block Date: Tue, 24 Jun 2014 18:51:10 +0000 (UTC) To: doc-committers@freebsd.org, svn-doc-all@freebsd.org, svn-doc-head@freebsd.org Subject: svn commit: r45117 - head/en_US.ISO8859-1/books/handbook/geom X-SVN-Group: doc-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-doc-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: "SVN commit messages for the entire doc trees \(except for " user" , " projects" , and " translations" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jun 2014 18:51:10 -0000 Author: wblock Date: Tue Jun 24 18:51:09 2014 New Revision: 45117 URL: http://svnweb.freebsd.org/changeset/doc/45117 Log: Whitespace-only fixes, translators please ignore. Modified: head/en_US.ISO8859-1/books/handbook/geom/chapter.xml Modified: head/en_US.ISO8859-1/books/handbook/geom/chapter.xml ============================================================================== --- head/en_US.ISO8859-1/books/handbook/geom/chapter.xml Tue Jun 24 18:41:26 2014 (r45116) +++ head/en_US.ISO8859-1/books/handbook/geom/chapter.xml Tue Jun 24 18:51:09 2014 (r45117) @@ -311,16 +311,16 @@ Done. old metadata from a previous mirror. GPT metadata can be erased with - &man.gpart.8;. This example erases both primary - and backup GPT partition tables from disk + &man.gpart.8;. This example erases both primary and backup + GPT partition tables from disk ada8: &prompt.root; gpart destroy -F ada8 A disk can be removed from an active mirror and the - metadata erased in one step using &man.gmirror.8;. - Here, the example disk ada8 is removed - from the active mirror gm4: + metadata erased in one step using &man.gmirror.8;. Here, the + example disk ada8 is removed from the + active mirror gm4: &prompt.root; gmirror remove gm4 ada8 @@ -330,15 +330,13 @@ Done. &prompt.root; gmirror clear ada8 - &man.gmirror.8; stores one block of - metadata at the end of the disk. Because - GPT partition schemes also store metadata - at the end of the disk, mirroring entire - GPT disks with &man.gmirror.8; - is not recommended. MBR partitioning is - used here because it only stores a partition table at the - start of the disk and does not conflict with the - mirror metadata. + &man.gmirror.8; stores one block of metadata at the end of + the disk. Because GPT partition schemes + also store metadata at the end of the disk, mirroring entire + GPT disks with &man.gmirror.8; is not + recommended. MBR partitioning is used here + because it only stores a partition table at the start of the + disk and does not conflict with the mirror metadata. @@ -361,16 +359,16 @@ Done. &prompt.root; gmirror label -v gm0 /dev/ada1 /dev/ada2 - gm0 is a user-chosen - device name assigned to the new mirror. After the mirror has - been started, this device name appears in + gm0 is a user-chosen device name + assigned to the new mirror. After the mirror has been + started, this device name appears in /dev/mirror/. MBR and bsdlabel partition tables can now - be created on the mirror with &man.gpart.8;. This - example uses a traditional file system layout, with partitions - for /, swap, /var, + be created on the mirror with &man.gpart.8;. This example + uses a traditional file system layout, with partitions for + /, swap, /var, /tmp, and /usr. A single / file system and a swap partition will also work. @@ -421,8 +419,8 @@ Done. &prompt.root; newfs -U /dev/mirror/gm0s1f File systems from the original ada0 - disk can now be copied onto the mirror with - &man.dump.8; and &man.restore.8;. + disk can now be copied onto the mirror with &man.dump.8; and + &man.restore.8;. &prompt.root; mount /dev/mirror/gm0s1a /mnt &prompt.root; dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -) @@ -493,17 +491,17 @@ Done. 1000204821504 # mediasize in bytes (931G) Create a mirror on the new disk. To make certain that the - mirror capacity is not any larger than the original ada0 drive, - &man.gnop.8; is used to create a fake drive of the - exact same size. This drive does not store any data, but is - used only to limit the size of the mirror. When - &man.gmirror.8; creates the mirror, it will + mirror capacity is not any larger than the original + ada0 drive, &man.gnop.8; is used to + create a fake drive of the exact same size. This drive does + not store any data, but is used only to limit the size of the + mirror. When &man.gmirror.8; creates the mirror, it will restrict the capacity to the size of gzero.nop, even if the new ada1 drive has more space. Note that the - 1000204821504 in the second line - is equal to ada0's media size as - shown by diskinfo above. + 1000204821504 in the second line is + equal to ada0's media size as shown by + diskinfo above. &prompt.root; geom zero load &prompt.root; gnop create -s 1000204821504 gzero @@ -533,9 +531,8 @@ Done. 63 1953525105 1 freebsd [active] (931G) In this case, the partition table must be edited to reduce - the capacity by one sector on - mirror/gm0. The procedure will be - explained later. + the capacity by one sector on mirror/gm0. + The procedure will be explained later. In either case, partition tables on the primary disk should be first copied using gpart backup @@ -562,12 +559,11 @@ BSD 8 6 freebsd-ufs 130023424 838860800 7 freebsd-ufs 968884224 984640881 - If no - free space is shown at the end of the disk, the size of both the slice - and the last partition must be reduced by one sector. Edit - the two files, reducing the size of both the slice and last - partition by one. These are the last numbers in each - listing. + If no free space is shown at the end of the disk, the size + of both the slice and the last partition must be reduced by + one sector. Edit the two files, reducing the size of both the + slice and last partition by one. These are the last numbers + in each listing. &prompt.root; cat table.ada0 MBR 4 @@ -619,8 +615,8 @@ BSD 8 one free block at the end of the disk. Create file systems on these new partitions. The number - of partitions will vary to match the - original disk, ada0. + of partitions will vary to match the original disk, + ada0. &prompt.root; newfs -U /dev/mirror/gm0s1a &prompt.root; newfs -U /dev/mirror/gm0s1d @@ -656,15 +652,15 @@ BSD 8 If the geom_mirror.ko kernel module has not been built into the kernel, edit - /boot/loader.conf to load it at boot: + /boot/loader.conf to load it at + boot: geom_mirror_load="YES" File systems from the original disk can now be copied onto - the mirror with &man.dump.8; and - &man.restore.8;. - Each file system dumped with - dump -L will create a snapshot first, which can take some time. + the mirror with &man.dump.8; and &man.restore.8;. Each file + system dumped with dump -L will create a + snapshot first, which can take some time. &prompt.root; mount /dev/mirror/gm0s1a /mnt &prompt.root; dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -) @@ -698,8 +694,8 @@ BSD 8 mirror/gm0 has the same contents as ada0 before adding ada0 to the mirror. If the contents - previously copied by - &man.dump.8; and &man.restore.8; are not identical to what was on ada0, + previously copied by &man.dump.8; and &man.restore.8; are + not identical to what was on ada0, revert /etc/fstab to mount the file systems on ada0, reboot, and start the whole procedure again. @@ -825,10 +821,10 @@ mountroot> &prompt.root; gmirror forget gm0 Any old metadata should be cleared from the replacement - disk using the instructions in . Then the replacement disk, - ada4 for this example, is inserted into - the mirror: + disk using the instructions in + . Then the replacement + disk, ada4 for this example, is inserted + into the mirror: &prompt.root; gmirror insert gm0 /dev/ada4