PERFORCE change 134577 for review

[Gabor Pali]

http://perforce.freebsd.org/chv.cgi?CH=134577

Change 134577 by pgj at disznohal on 2008/02/01 04:01:53

	IFC before translation

Affected files ...

.. //depot/projects/docproj_hu/books/handbook/disks/chapter.sgml#2 edit

Differences ...

==== //depot/projects/docproj_hu/books/handbook/disks/chapter.sgml#2 (text+ko) ====

@@ -1,7 +1,7 @@
 <!--
      The FreeBSD Documentation Project
 
-     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.277 2007/08/23 08:48:34 blackend Exp $
+     $FreeBSD: doc/en_US.ISO8859-1/books/handbook/disks/chapter.sgml,v 1.281 2008/01/22 16:45:19 trhodes Exp $
 -->
 
 <chapter id="disks">
@@ -2779,27 +2779,12 @@
 
 cp /root/.profile /mnt/root
 
-cp -f /dev/MAKEDEV /mnt/dev
-chmod 755 /mnt/dev/MAKEDEV
-
 chmod 500 /mnt/sbin/init
 chmod 555 /mnt/sbin/fsck /mnt/sbin/mount /mnt/sbin/halt
 chmod 555 /mnt/bin/sh /mnt/bin/sync
 chmod 6555 /mnt/sbin/restore
 
 #
-# create the devices nodes
-#
-cd /mnt/dev
-./MAKEDEV std
-./MAKEDEV da0
-./MAKEDEV da1
-./MAKEDEV da2
-./MAKEDEV sa0
-./MAKEDEV pty0
-cd /
-
-#
 # create minimum file system table
 #
 cat > /mnt/etc/fstab <<EOM
@@ -3581,7 +3566,7 @@
 	    initialized before it can be used. This initialization needs to
 	    be performed only once:</para>
 
-	  <screen>&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c</userinput></screen>
+	  <screen>&prompt.root; <userinput>gbde init /dev/ad4s1c -i -L /etc/gbde/ad4s1c.lock</userinput></screen>
 
 	  <para>&man.gbde.8; will open your editor, permitting you to set
 	    various configuration options in a template. For use with UFS1
@@ -3613,7 +3598,11 @@
 	  <para>The <command>gbde init</command> command creates a lock
 	    file for your <application>gbde</application> partition that in
 	    this example is stored as
-	    <filename>/etc/gbde/ad4s1c</filename>.</para>
+	    <filename>/etc/gbde/ad4s1c.lock</filename>.
+	    <application>gbde</application> lock files must end in
+	    <quote>.lock</quote> in order to be correctly detected by
+	    the
+	    <filename>/etc/rc.d/gbde</filename> start up script.</para>
 
 	  <caution>
 	    <para><application>gbde</application> lock files
@@ -3631,7 +3620,7 @@
 	<step>
 	  <title>Attach the Encrypted Partition to the Kernel</title>
 
-	  <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c</userinput></screen>
+	  <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
 
 	  <para> You will be asked to provide the passphrase that you
 	    selected during the initialization of the encrypted partition.
@@ -3708,7 +3697,7 @@
 	<step>
 	  <title>Attach the gbde Partition to the Kernel</title>
 
-	  <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c</userinput></screen>
+	  <screen>&prompt.root; <userinput>gbde attach /dev/ad4s1c -l /etc/gbde/ad4s1c.lock</userinput></screen>
 
 	  <para>You will be asked to provide the passphrase that you
 	    selected during initialization of the encrypted
@@ -3749,7 +3738,8 @@
 	  &man.rc.conf.5;, for example:</para>
 
 	<programlisting>gbde_autoattach_all="YES"
-gbde_devices="ad4s1c"</programlisting>
+gbde_devices="ad4s1c"
+gbde_lockdir="/etc/gbde"</programlisting>
 
 	<para>This will require that the <application>gbde</application>
 	  passphrase be entered at boot time.  After typing the correct
@@ -4099,6 +4089,10 @@
 	a sectorsize of 4 kilobytes and the <quote>detach on last close</quote>
 	option set:</para>
 
+      <programlisting>geli_swap_flags="-e blowfish -l 128 -s 4096 -d"</programlisting>
+
+      <para>For systems prior to &os; 6.2-RELEASE, use the following line:</para>
+
       <programlisting>geli_swap_flags="-a blowfish -l 128 -s 4096 -d"</programlisting>
 
       <para>Please refer to the description of the <command>onetime</command> command