From c1674dbf31936f19e05050ac869df71910650713 Mon Sep 17 00:00:00 2001
From: Miroslav Kure <kurem@upcase.inf.upol.cz>
Date: Mon, 16 Oct 2006 18:45:07 +0000
Subject: Reflect new naming scheme for dm-crypt devices

---
 en/boot-new/mount-encrypted.xml         | 9 +++++----
 en/using-d-i/modules/partman-crypto.xml | 4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/en/boot-new/mount-encrypted.xml b/en/boot-new/mount-encrypted.xml
index 631088ce2..68d4d78bd 100644
--- a/en/boot-new/mount-encrypted.xml
+++ b/en/boot-new/mount-encrypted.xml
@@ -22,12 +22,13 @@ For partitions encrypted using dm-crypt you will be shown the following
 prompt during the boot:
 
 <informalexample><screen>
-Starting early crypto disks... crypt<replaceable>X</replaceable>(starting)
+Starting early crypto disks... <replaceable>part</replaceable>_crypt(starting)
 Enter LUKS passphrase:
 </screen></informalexample>
 
-In the first line of the prompt, <replaceable>X</replaceable> is the
-number of the loop device. You are now probably wondering
+In the first line of the prompt, <replaceable>part</replaceable> is the
+name of the underlying partition, e.g. sda2 or md0.
+You are now probably wondering
 <emphasis>for which volume</emphasis> you are actually entering the
 passphrase. Does it relate to your <filename>/home</filename>? Or to
 <filename>/var</filename>? Of course, if you have just one encrypted
@@ -36,7 +37,7 @@ when setting up this volume. If you set up more than one encrypted
 volume during the installation, the notes you wrote down as the last
 step in <xref linkend="partman-crypto"/> come in handy. If you did not
 make a note of the mapping between
-<filename>crypt<replaceable>X</replaceable></filename> and the mount
+<filename><replaceable>part</replaceable>_crypt</filename> and the mount
 points before, you can still find it
 in <filename>/etc/crypttab</filename>
 and <filename>/etc/fstab</filename> of your new system.
diff --git a/en/using-d-i/modules/partman-crypto.xml b/en/using-d-i/modules/partman-crypto.xml
index b264c8ac1..f12b6671a 100644
--- a/en/using-d-i/modules/partman-crypto.xml
+++ b/en/using-d-i/modules/partman-crypto.xml
@@ -334,7 +334,7 @@ different volumes. The first one is encrypted via dm-crypt, the second
 one via loop-AES.
 
 <informalexample><screen>
-Encrypted volume (<replaceable>crypt0</replaceable>) - 115.1 GB Linux device-mapper
+Encrypted volume (<replaceable>sda2_crypt</replaceable>) - 115.1 GB Linux device-mapper
      #1 115.1 GB  F ext3
 
 Loopback (<replaceable>loop0</replaceable>) - 515.2 MB AES256 keyfile
@@ -347,7 +347,7 @@ change the file system types if the defaults do not suit you.
 </para><para>
 
 One thing to note here are the identifiers in parentheses
-(<replaceable>crypt0</replaceable>
+(<replaceable>sda2_crypt</replaceable>
 and <replaceable>loop0</replaceable> in this case) and the mount
 points you assigned to each encrypted volume. You will need this
 information later when booting the new system. The differences between
-- 
cgit v1.2.3