svn commit: r45117 - head/en_US.ISO8859-1/books/handbook/geom
Warren Block
wblock at FreeBSD.org
Tue Jun 24 18:51:10 UTC 2014
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.</screen>
old metadata from a previous mirror.</para>
<para><acronym>GPT</acronym> metadata can be erased with
- &man.gpart.8;. This example erases both primary
- and backup <acronym>GPT</acronym> partition tables from disk
+ &man.gpart.8;. This example erases both primary and backup
+ <acronym>GPT</acronym> partition tables from disk
<filename>ada8</filename>:</para>
<screen>&prompt.root; <userinput>gpart destroy -F ada8</userinput></screen>
<para>A disk can be removed from an active mirror and the
- metadata erased in one step using &man.gmirror.8;.
- Here, the example disk <filename>ada8</filename> is removed
- from the active mirror <filename>gm4</filename>:</para>
+ metadata erased in one step using &man.gmirror.8;. Here, the
+ example disk <filename>ada8</filename> is removed from the
+ active mirror <filename>gm4</filename>:</para>
<screen>&prompt.root; <userinput>gmirror remove gm4 ada8</userinput></screen>
@@ -330,15 +330,13 @@ Done.</screen>
<screen>&prompt.root; <userinput>gmirror clear ada8</userinput></screen>
- <para>&man.gmirror.8; stores one block of
- metadata at the end of the disk. Because
- <acronym>GPT</acronym> partition schemes also store metadata
- at the end of the disk, mirroring entire
- <acronym>GPT</acronym> disks with &man.gmirror.8;
- is not recommended. <acronym>MBR</acronym> 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.</para>
+ <para>&man.gmirror.8; stores one block of metadata at the end of
+ the disk. Because <acronym>GPT</acronym> partition schemes
+ also store metadata at the end of the disk, mirroring entire
+ <acronym>GPT</acronym> disks with &man.gmirror.8; is not
+ recommended. <acronym>MBR</acronym> 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.</para>
</sect2>
<sect2 xml:id="geom-mirror-two-new-disks">
@@ -361,16 +359,16 @@ Done.</screen>
<screen>&prompt.root; <userinput>gmirror label -v gm0 /dev/ada1 /dev/ada2</userinput></screen>
- <para><filename>gm0</filename> is a user-chosen
- device name assigned to the new mirror. After the mirror has
- been started, this device name appears in
+ <para><filename>gm0</filename> is a user-chosen device name
+ assigned to the new mirror. After the mirror has been
+ started, this device name appears in
<filename>/dev/mirror/</filename>.</para>
<para><acronym>MBR</acronym> and
<application>bsdlabel</application> partition tables can now
- be created on the mirror with &man.gpart.8;. This
- example uses a traditional file system layout, with partitions
- for <filename>/</filename>, swap, <filename>/var</filename>,
+ be created on the mirror with &man.gpart.8;. This example
+ uses a traditional file system layout, with partitions for
+ <filename>/</filename>, swap, <filename>/var</filename>,
<filename>/tmp</filename>, and <filename>/usr</filename>. A
single <filename>/</filename> file system and a swap partition
will also work.</para>
@@ -421,8 +419,8 @@ Done.</screen>
&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1f</userinput></screen>
<para>File systems from the original <filename>ada0</filename>
- disk can now be copied onto the mirror with
- &man.dump.8; and &man.restore.8;.</para>
+ disk can now be copied onto the mirror with &man.dump.8; and
+ &man.restore.8;.</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
@@ -493,17 +491,17 @@ Done.</screen>
1000204821504 # mediasize in bytes (931G)</screen>
<para>Create a mirror on the new disk. To make certain that the
- mirror capacity is not any larger than the original <filename>ada0</filename> 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
+ <filename>ada0</filename> 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
<filename>gzero.nop</filename>, even if the new
<filename>ada1</filename> drive has more space. Note that the
- <replaceable>1000204821504</replaceable> in the second line
- is equal to <filename>ada0</filename>'s media size as
- shown by <command>diskinfo</command> above.</para>
+ <replaceable>1000204821504</replaceable> in the second line is
+ equal to <filename>ada0</filename>'s media size as shown by
+ <command>diskinfo</command> above.</para>
<screen>&prompt.root; <userinput>geom zero load</userinput>
&prompt.root; <userinput>gnop create -s 1000204821504 gzero</userinput>
@@ -533,9 +531,8 @@ Done.</screen>
63 1953525105 1 freebsd [active] (931G)</screen>
<para>In this case, the partition table must be edited to reduce
- the capacity by one sector on
- <filename>mirror/gm0</filename>. The procedure will be
- explained later.</para>
+ the capacity by one sector on <filename>mirror/gm0</filename>.
+ The procedure will be explained later.</para>
<para>In either case, partition tables on the primary disk
should be first copied using <command>gpart backup</command>
@@ -562,12 +559,11 @@ BSD 8
6 freebsd-ufs 130023424 838860800
7 freebsd-ufs 968884224 984640881</screen>
- <para>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.</para>
+ <para>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.</para>
<screen>&prompt.root; <userinput>cat table.ada0</userinput>
MBR 4
@@ -619,8 +615,8 @@ BSD 8
one free block at the end of the disk.</para>
<para>Create file systems on these new partitions. The number
- of partitions will vary to match the
- original disk, <filename>ada0</filename>.</para>
+ of partitions will vary to match the original disk,
+ <filename>ada0</filename>.</para>
<screen>&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1a</userinput>
&prompt.root; <userinput>newfs -U /dev/mirror/gm0s1d</userinput>
@@ -656,15 +652,15 @@ BSD 8
<para>If the <filename>geom_mirror.ko</filename> kernel module
has not been built into the kernel, edit
- <filename>/boot/loader.conf</filename> to load it at boot:</para>
+ <filename>/boot/loader.conf</filename> to load it at
+ boot:</para>
<programlisting>geom_mirror_load="YES"</programlisting>
<para>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
- <command>dump -L</command> will create a snapshot first, which can take some time.</para>
+ the mirror with &man.dump.8; and &man.restore.8;. Each file
+ system dumped with <command>dump -L</command> will create a
+ snapshot first, which can take some time.</para>
<screen>&prompt.root; <userinput>mount /dev/mirror/gm0s1a /mnt</userinput>
&prompt.root; <userinput>dump -C16 -b64 -0aL -f - / | (cd /mnt && restore -rf -)</userinput>
@@ -698,8 +694,8 @@ BSD 8
<filename>mirror/gm0</filename> has the same contents as
<filename>ada0</filename> before adding
<filename>ada0</filename> to the mirror. If the contents
- previously copied by
- &man.dump.8; and &man.restore.8; are not identical to what was on <filename>ada0</filename>,
+ previously copied by &man.dump.8; and &man.restore.8; are
+ not identical to what was on <filename>ada0</filename>,
revert <filename>/etc/fstab</filename> to mount the file
systems on <filename>ada0</filename>, reboot, and start the
whole procedure again.</para>
@@ -825,10 +821,10 @@ mountroot></screen>
<screen>&prompt.root; <userinput>gmirror forget gm0</userinput></screen>
<para>Any old metadata should be cleared from the replacement
- disk using the instructions in <xref
- linkend="geom-mirror-metadata"/>. Then the replacement disk,
- <filename>ada4</filename> for this example, is inserted into
- the mirror:</para>
+ disk using the instructions in
+ <xref linkend="geom-mirror-metadata"/>. Then the replacement
+ disk, <filename>ada4</filename> for this example, is inserted
+ into the mirror:</para>
<screen>&prompt.root; <userinput>gmirror insert gm0 /dev/ada4</userinput></screen>
More information about the svn-doc-head
mailing list