diff options
| -rw-r--r-- | nl/boot-installer/x86.xml | 3 | ||||
| -rw-r--r-- | nl/boot-new/mount-encrypted.xml | 11 | ||||
| -rw-r--r-- | nl/howto/installation-howto.xml | 14 | ||||
| -rw-r--r-- | nl/using-d-i/modules/partman-crypto.xml | 6 |
4 files changed, 16 insertions, 18 deletions
diff --git a/nl/boot-installer/x86.xml b/nl/boot-installer/x86.xml index fb8776b79..3caa968b2 100644 --- a/nl/boot-installer/x86.xml +++ b/nl/boot-installer/x86.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 39622 untranslated --> +<!-- original version: 41808 untranslated --> <sect2 arch="x86"><title>Booting from a CD-ROM</title> @@ -230,7 +230,6 @@ argument, giving the device that the ide-floppy driver maps the device to. For example, if your LS-120 drive is connected as the first IDE device (master) on the second cable, you enter <userinput>linux root=/dev/hdc</userinput> at the boot prompt. -Installation from LS-120 is only supported by 2.4 and later kernels. </para><para> diff --git a/nl/boot-new/mount-encrypted.xml b/nl/boot-new/mount-encrypted.xml index 6cabaa907..d0d7b4028 100644 --- a/nl/boot-new/mount-encrypted.xml +++ b/nl/boot-new/mount-encrypted.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 40673 untranslated --> +<!-- original version: 41817 untranslated --> <sect1 id="mount-encrypted-volumes"> <title>Mounting encrypted volumes</title> @@ -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/nl/howto/installation-howto.xml b/nl/howto/installation-howto.xml index b01481e0a..88aebc125 100644 --- a/nl/howto/installation-howto.xml +++ b/nl/howto/installation-howto.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 41585 untranslated --> +<!-- original version: 41808 untranslated --> <appendix id="installation-howto"> <title>Installation Howto</title> @@ -95,7 +95,7 @@ To boot a PowerMac from CD, press the <keycap>c</keycap> key while booting. See If you can't boot from CD, you can download floppy images to install Debian. You need the <filename>floppy/boot.img</filename>, the -<filename>floppy/root.img</filename> and possibly one of the driver disks. +<filename>floppy/root.img</filename> and one or more of the driver disks. </para><para> @@ -106,8 +106,9 @@ use the one with <filename>root.img</filename> on it. </para><para> If you're planning to install over the network, you will usually need -the <filename>floppy/net-drivers.img</filename>, which contains additional -drivers for many ethernet cards, and support for PCMCIA. +the <filename>floppy/net-drivers-1.img</filename>. For PCMCIA or USB +networking, and some less common network cards, you will also need a second +driver floppy, <filename>floppy/net-drivers-2.img</filename>. </para><para> @@ -215,12 +216,9 @@ Once the installer starts, you will be greeted with an initial screen. Press methods and parameters (see <xref linkend="boot-parms" />). <phrase arch="i386"> If you want a 2.4 kernel, type <userinput>install24</userinput> at the -<prompt>boot:</prompt> prompt. +<prompt>boot:</prompt> prompt. The 2.6 kernel is the default. <footnote><para> -The 2.6 kernel is the default for most boot methods, but is not available -when booting from a floppy. - </para></footnote> </phrase> diff --git a/nl/using-d-i/modules/partman-crypto.xml b/nl/using-d-i/modules/partman-crypto.xml index f277524ed..e2f393f31 100644 --- a/nl/using-d-i/modules/partman-crypto.xml +++ b/nl/using-d-i/modules/partman-crypto.xml @@ -1,5 +1,5 @@ <!-- retain these comments for translator revision tracking --> -<!-- original version: 39460 untranslated --> +<!-- original version: 41817 untranslated --> <sect3 id="partman-crypto"> <title>Configuring Encrypted Volumes</title> @@ -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 |