summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nl/appendix/chroot-install.xml5
-rw-r--r--nl/appendix/graphical.xml8
-rw-r--r--nl/appendix/preseed.xml116
-rw-r--r--nl/boot-installer/intro-hd.xml4
-rw-r--r--nl/boot-installer/parameters.xml47
-rw-r--r--nl/hardware/network-cards.xml23
-rw-r--r--nl/hardware/supported/arm.xml10
-rw-r--r--nl/install-methods/download/arm.xml21
-rw-r--r--nl/install-methods/install-tftp.xml39
-rw-r--r--nl/install-methods/tftp/rarp.xml5
-rw-r--r--nl/install-methods/usb-setup/x86.xml31
11 files changed, 217 insertions, 92 deletions
diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml
index d97b9b5cf..b3daea288 100644
--- a/nl/appendix/chroot-install.xml
+++ b/nl/appendix/chroot-install.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 59249 untranslated -->
+<!-- original version: 61884 untranslated -->
<sect1 id="linux-upgrade">
<title>Installing &debian; from a Unix/Linux System</title>
@@ -417,7 +417,8 @@ Enter your system's host name (2 to 63 characters):
And a basic <filename>/etc/hosts</filename> with IPv6 support:
<informalexample><screen>
-127.0.0.1 localhost DebianHostName
+127.0.0.1 localhost
+127.0.1.1 DebianHostName
# The following lines are desirable for IPv6 capable hosts
::1 ip6-localhost ip6-loopback
diff --git a/nl/appendix/graphical.xml b/nl/appendix/graphical.xml
index ea23b24e4..253e199ce 100644
--- a/nl/appendix/graphical.xml
+++ b/nl/appendix/graphical.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 56145 untranslated -->
+<!-- original version: 61189 untranslated -->
<sect1 condition="gtk" id="graphical">
<title>The Graphical Installer</title>
@@ -104,6 +104,12 @@ enter will toggle a selection, not activate &BTN-CONT;.
</para><para>
+If a dialog offers additional help information, a <guibutton>Help</guibutton>
+button will be displayed. The help information can be accessed either by
+activating the button or by pressing the <keycap>F1</keycap> key.
+
+</para><para>
+
To switch to another console, you will also need to use the
<keycap>Ctrl</keycap> key, just as with the X Window System. For example,
to switch to VT2 (the first debug shell) you would use: <keycombo>
diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml
index 832add05f..bf878762f 100644
--- a/nl/appendix/preseed.xml
+++ b/nl/appendix/preseed.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 60603 untranslated -->
+<!-- original version: 62198 untranslated -->
<!--
Be careful with the format of this file as it is parsed to generate
@@ -529,6 +529,8 @@ always need to specify a value as well: for example,
<row><entry>auto</entry><entry>auto-install/enable</entry></row>
<row><entry>classes</entry><entry>auto-install/classes</entry></row>
<row><entry>fb</entry><entry>debian-installer/framebuffer</entry></row>
+<row><entry>language</entry><entry>debian-installer/language</entry></row>
+<row><entry>country</entry><entry>debian-installer/country</entry></row>
<row><entry>locale</entry><entry>debian-installer/locale</entry></row>
<row><entry>priority</entry><entry>debconf/priority</entry></row>
<row><entry>file</entry><entry>preseed/file</entry></row>
@@ -725,9 +727,31 @@ select a locale that is valid for the selected language.
To specify the locale as a boot parameter, use
<userinput>locale=<replaceable>en_US</replaceable></userinput>.
+</para><para>
+
+Although this method is very easy to use, it does not allow preseeding of
+all possible combinations of language, country and locale<footnote>
+
+<para>
+Preseeding <literal>locale</literal> to <userinput>en_NL</userinput> would
+for example result in <literal>en_US.UTF-8</literal> as default locale for
+the installed system. If e.g. <literal>en_GB.UTF-8</literal> is preferred
+instead, the values will need to be preseeded individually.
+</para>
+
+</footnote>. So alternatively the values can be preseeded individually.
+Language and country can also be specified as boot parameters.
+
<informalexample role="example"><screen>
-# Locale sets language and country.
+# Preseeding only locale sets language, country and locale.
d-i debian-installer/locale string en_US
+
+# The values can also be preseeded individually for greater flexibility.
+#d-i debian-installer/language string en
+#d-i debian-installer/country string NL
+#d-i debian-installer/locale string en_GB.UTF-8
+# Optionally specify additional locales to be generated.
+#d-i localechooser/supported-locales en_US.UTF-8, nl_NL.UTF-8
</screen></informalexample>
</para><para>
@@ -899,9 +923,8 @@ The parameter <classname>mirror/udeb/suite</classname> determines the suite
for additional components for the installer. It is only useful to set this
if components are actually downloaded over the network and should match the
suite that was used to build the initrd for the installation method used for
-the installation.
-By default the value for <classname>mirror/udeb/suite</classname> is the
-same as <classname>mirror/suite</classname>.
+the installation. Normally the installer will automatically use the correct
+value and there should be no need to set this.
</para>
@@ -944,12 +967,29 @@ d-i clock-setup/ntp boolean true
<title>Partitioning</title>
<para>
-Using preseeding to partition the harddisk is very much limited to what is
-supported by <classname>partman-auto</classname>. You can choose to partition
+Using preseeding to partition the harddisk is limited to what is supported
+by <classname>partman-auto</classname>. You can choose to partition
either existing free space on a disk or a whole disk. The layout of the
disk can be determined by using a predefined recipe, a custom recipe from
-a recipe file or a recipe included in the preconfiguration file. It is
-currently not possible to partition multiple disks using preseeding.
+a recipe file or a recipe included in the preconfiguration file.
+
+</para><para>
+
+Preseeding of advanced partition setups using RAID, LVM and encryption is
+supported, but not with the full flexibility possible when partitioning
+during a non-preseeded install.
+
+</para><para>
+
+The examples below only provide basic information on the use of recipes.
+For detailed information see the files
+<filename>partman-auto-recipe.txt</filename> and
+<filename>partman-auto-raid-recipe.txt</filename> included in the
+<classname>debian-installer</classname> package.
+Both files are also available from the
+<ulink url="&url-d-i-websvn;/trunk/installer/doc/devel/">&d-i; source
+repository</ulink>. Note that the supported functionality may change
+between releases.
</para>
@@ -961,18 +1001,25 @@ correct one will be selected before using preseeding.
</para></warning>
+ <sect3 id="preseed-partman-example">
+ <title>Partitioning example</title>
+
<informalexample role="example"><screen>
# If the system has free space you can choose to only partition that space.
# This is only honoured if partman-auto/method (below) is not set.
#d-i partman-auto/init_automatically_partition select biggest_free
-# Alternatively, you can specify a disk to partition. The device name must
-# be given in traditional non-devfs format.
-# Note: A disk must be specified, unless the system has only one disk.
+# Alternatively, you may specify a disk to partition. If the system has only
+# one disk the installer will default to using that, but otherwise the device
+# name must be given in traditional, non-devfs format (so e.g. /dev/hda or
+# /dev/sda, and not e.g. /dev/discs/disc0/disc).
# For example, to use the first SCSI/SATA hard disk:
#d-i partman-auto/disk string /dev/sda
# In addition, you'll need to specify the method to use.
-# The presently available methods are: "regular", "lvm" and "crypto"
+# The presently available methods are:
+# - regular: use the usual partition types for your architecture
+# - lvm: use LVM to partition the disk
+# - crypto: use LVM within an encrypted partition
d-i partman-auto/method string lvm
# If one of the disks that are going to be automatically partitioned
@@ -991,7 +1038,6 @@ d-i partman-lvm/confirm boolean true
d-i partman-auto/choose_recipe select atomic
# Or provide a recipe of your own...
-# The recipe format is documented in the file devel/partman-auto-recipe.txt.
# If you have a way to get a recipe file into the d-i environment, you can
# just point at it.
#d-i partman-auto/expert_recipe_file string /hd-media/recipe
@@ -1016,6 +1062,12 @@ d-i partman-auto/choose_recipe select atomic
# method{ swap } format{ } \
# .
+# The full recipe format is documented in the file partman-auto-recipe.txt
+# included in the 'debian-installer' package or available from D-I source
+# repository. This also documents how to specify settings such as file
+# system labels, volume group names and which physical devices to include
+# in a volume group.
+
# This makes partman automatically partition without confirmation, provided
# that you told it what to do using one of the methods above.
d-i partman-partitioning/confirm_write_new_label boolean true
@@ -1023,10 +1075,9 @@ d-i partman/choose_partition select finish
d-i partman/confirm boolean true
</screen></informalexample>
- </sect2>
-
- <sect2 id="preseed-partman-raid">
- <title>Partitioning using RAID</title>
+ </sect3>
+ <sect3 id="preseed-partman-raid">
+ <title>Partitioning using RAID</title>
<para>
You can also use preseeding to set up partitions on software RAID arrays.
@@ -1047,9 +1098,7 @@ Check <filename>/var/log/syslog</filename> if you run into problems.
</para></warning>
-<informalexample><screen>
-# NOTE: this option is of beta release quality and should be used carefully
-
+<informalexample role="example"><screen>
# The method should be set to "raid".
#d-i partman-auto/method string raid
# Specify the disks to be partitioned. They will all get the same layout,
@@ -1071,11 +1120,12 @@ Check <filename>/var/log/syslog</filename> if you run into problems.
# Last you need to specify how the previously defined partitions will be
# used in the RAID setup. Remember to use the correct partition numbers
-# for logical partitions.
+# for logical partitions. RAID levels 0, 1, 5, 6 and 10 are supported;
+# devices are separated using "#".
# Parameters are:
# &lt;raidtype&gt; &lt;devcount&gt; &lt;sparecount&gt; &lt;fstype&gt; &lt;mountpoint&gt; \
# &lt;devices&gt; &lt;sparedevices&gt;
-# RAID levels 0, 1, 5, 6 and 10 are supported; devices are separated using "#"
+
#d-i partman-auto-raid/recipe string \
# 1 2 0 ext3 / \
# /dev/sda1#/dev/sdb1 \
@@ -1087,6 +1137,10 @@ Check <filename>/var/log/syslog</filename> if you run into problems.
# /dev/sda6#/dev/sdb6 \
# .
+# For additional information see the file partman-auto-raid-recipe.txt
+# included in the 'debian-installer' package or available from D-I source
+# repository.
+
# This makes partman automatically partition without confirmation.
d-i partman-md/confirm boolean true
d-i partman-partitioning/confirm_write_new_label boolean true
@@ -1094,10 +1148,10 @@ d-i partman/choose_partition select finish
d-i partman/confirm boolean true
</screen></informalexample>
- </sect2>
+ </sect3>
- <sect2 id="preseed-partman-mount-styles">
- <title>Controlling how partitions are mounted</title>
+ <sect3 id="preseed-partman-mount-styles">
+ <title>Controlling how partitions are mounted</title>
<para>
Normally, filesystems are mounted using a universally unique identifier
@@ -1131,6 +1185,7 @@ be random.
#d-i partman/mount_style select uuid
</screen></informalexample>
+ </sect3>
</sect2>
<sect2 id="preseed-base-installer">
@@ -1143,6 +1198,11 @@ installation. The only questions asked concern the installation of the kernel.
</para>
<informalexample role="example"><screen>
+# Configure APT to not install recommended packages by default. Use of this
+# option can result in an incomplete system and should only be used by very
+# experienced users.
+#d-i base-installer/install-recommends boolean false
+
# Select the initramfs generator used to generate the initrd for 2.6 kernels.
#d-i base-installer/kernel/linux/initramfs-generators string yaird
@@ -1332,10 +1392,6 @@ to be used easily on the kernel command line as well.
# Individual additional packages to install
#d-i pkgsel/include string openssh-server build-essential
-# By default, packages that are only Recommended by packages installed using
-# pkgsel/include (as opposed to their dependencies) will not be installed.
-# Uncomment this line to install Recommends as well.
-#d-i pkgsel/include/install-recommends boolean true
# Whether to upgrade packages after debootstrap.
# Allowed values: none, safe-upgrade, full-upgrade
#d-i pkgsel/upgrade select none
diff --git a/nl/boot-installer/intro-hd.xml b/nl/boot-installer/intro-hd.xml
index 569a87fb0..4df9f39b8 100644
--- a/nl/boot-installer/intro-hd.xml
+++ b/nl/boot-installer/intro-hd.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 28672 untranslated -->
+<!-- original version: 61184 untranslated -->
<para>
@@ -10,7 +10,7 @@ installation.
</para><para>
To boot the installer from hard disk, you will have already completed
-downloading and placing the needed files in
+downloading and placing the needed files as described in
<xref linkend="boot-drive-files"/>.
</para>
diff --git a/nl/boot-installer/parameters.xml b/nl/boot-installer/parameters.xml
index 4693d8175..6edfada39 100644
--- a/nl/boot-installer/parameters.xml
+++ b/nl/boot-installer/parameters.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 61147 untranslated -->
+<!-- original version: 62399 untranslated -->
<sect1 id="boot-parms"><title>Boot Parameters</title>
<para>
@@ -405,6 +405,26 @@ installation.
</varlistentry>
<varlistentry>
+<term>base-installer/install-recommends (recommends)</term>
+<listitem><para>
+
+By setting this option to <userinput>false</userinput>, the package
+management system will be configured to not automatically install
+<quote>Recommends</quote>, both during the installation and for the
+installed system. See also <xref linkend="di-install-base"/>.
+
+</para><para>
+
+Note that this option allows to have a leaner system, but can also result
+in features being missing that you might normally expect to be available.
+You may have to manually install some of the recommended packages to
+obtain the full functionality you want. This option should therefore only
+be used by very experienced users.
+
+</para></listitem>
+</varlistentry>
+
+<varlistentry>
<term>debian-installer/allow_unauthenticated</term>
<listitem><para>
@@ -509,13 +529,30 @@ cases. General instructions how to do this can be found in
<variablelist>
<varlistentry>
+<term>debian-installer/language (language)</term>
+<term>debian-installer/country (country)</term>
<term>debian-installer/locale (locale)</term>
<listitem><para>
-Can be used to set both the language and country for the installation.
-This will only work if the locale is supported in Debian.
-For example, use <userinput>locale=de_CH</userinput> to select German as
-language and Switzerland as country.
+There are two ways to specify the language, country and locale to use for
+the installation and the installed system.
+
+</para><para>
+
+The first and easiest is to pass only the parameter <literal>locale</literal>.
+Language and country will then be derived from its value. You can for example
+use <userinput>locale=de_CH</userinput> to select German as language and
+Switzerland as country (<literal>de_CH.UTF-8</literal> will be set as default
+locale for the installed system). Limitation is that not all possible
+combinations of language, country and locale can be achieved this way.
+
+</para><para>
+
+The second, more flexible option is to specify <literal>language</literal>
+and <literal>country</literal> separately. In this case
+<literal>locale</literal> can optionally be added to specify a specific
+default locale for the installed system. Example:
+<userinput>language=en country=DE locale=en_GB.UTF-8</userinput>.
</para></listitem>
</varlistentry>
diff --git a/nl/hardware/network-cards.xml b/nl/hardware/network-cards.xml
index 33bf20cba..8f6528051 100644
--- a/nl/hardware/network-cards.xml
+++ b/nl/hardware/network-cards.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 61133 untranslated -->
+<!-- original version: 61626 untranslated -->
<sect2 id="network-cards">
<title>Network Connectivity Hardware</title>
@@ -90,17 +90,26 @@ ISDN is supported, but not during the installation.
<para>
Wireless networking is in general supported as well and a growing number of
-wireless adapters is supported by the official Linux kernel, although many
-of them do require firmware to be loaded.
+wireless adapters are supported by the official Linux kernel, although many
+of them do require firmware to be loaded. If firmware is needed, the installer
+will prompt you to load firmware. See <xref linkend="loading-firmware"/>
+for detailed information on how to load firmware during the installation.
+
+</para><para>
+
Wireless NICs that are not supported by the official Linux kernel can generally
be made to work under &debian;, but are not supported during the installation.
</para><para>
-The use of wireless networking during installation is still under development
-and whether it will work depends on the type of adaptor and the configuration
-of your wireless access point.
-If there is no other NIC you can use during the installation, it is still
+Support for encrypted wireless during installation is currently limited to WEP.
+If your access point uses stronger encryption, it cannot be used during the
+installation process.
+
+</para><para>
+
+If there is a problem with wireless and there
+is no other NIC you can use during the installation, it is still
possible to install &debian; using a full CD-ROM or DVD image. Select the
option to not configure a network and install using only the packages
available from the CD/DVD. You can then install the driver and firmware you
diff --git a/nl/hardware/supported/arm.xml b/nl/hardware/supported/arm.xml
index 1b7a2d810..c71d45861 100644
--- a/nl/hardware/supported/arm.xml
+++ b/nl/hardware/supported/arm.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 58440 untranslated -->
+<!-- original version: 61324 untranslated -->
<sect2 arch="arm"><title>CPU, Main Boards, and Video Support</title>
@@ -62,10 +62,12 @@ url="&url-arm-cyrius-nslu2;">installation instructions</ulink>.
Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM
CPU, Ethernet, SATA, USB, and other functionality in one chip. We
-currently support the following Kirkwood based devices: <ulink
+currently support the following Kirkwood based devices: OpenRD (OpenRD-Base
+and OpenRD-Client), <ulink
url="&url-arm-cyrius-sheevaplug;">SheevaPlug</ulink> and <ulink
-url="&url-arm-cyrius-qnap-kirkwood;">QNAP Turbo Station</ulink> (TS-119 and
-TS-219).
+url="&url-arm-cyrius-qnap-kirkwood;">QNAP Turbo Station</ulink> (TS-110,
+TS-119, TS-210, TS-219 and TS-219P; the TS-410 and TS-419P are not yet
+supported).
</para></listitem>
</varlistentry>
diff --git a/nl/install-methods/download/arm.xml b/nl/install-methods/download/arm.xml
index 687b6deb9..1a9dd5664 100644
--- a/nl/install-methods/download/arm.xml
+++ b/nl/install-methods/download/arm.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 58440 untranslated -->
+<!-- original version: 61346 untranslated -->
<sect3 arch="arm" id="nslu2-install-files">
@@ -66,9 +66,22 @@ obtained from &mv2120-firmware-img;.
<title>QNAP Turbo Station Installation Files</title>
<para>
-The QNAP Turbo Station (TS-109, TS-209 and TS-409) requires a kernel and
-ramdisk which can be obtained from &qnap-orion-firmware-img;. A script is
-provided to write these images to flash.
+The installation files for the QNAP Turbo Station consist of a kernel and
+ramdisk as well as a script to write these images to flash. You can obtain
+the installation files for QNAP TS-109 and TS-209 from
+&qnap-orion-firmware-img; and for QNAP TS-110, TS-119, TS-210, TS-219,
+TS-219P from &qnap-kirkwood-firmware-img;.
+
+</para>
+ </sect3>
+
+ <sect3 arch="arm" id="marvell-install-files">
+ <title>SheevaPlug and OpenRD Installation Files</title>
+<para>
+
+The installation files for the Marvell SheevaPlug and OpenRD devices
+consist of a kernel and initrd for U-Boot. You can obtain these files
+from &kirkwood-marvell-firmware-img;.
</para>
</sect3>
diff --git a/nl/install-methods/install-tftp.xml b/nl/install-methods/install-tftp.xml
index 5988ed085..999b3469e 100644
--- a/nl/install-methods/install-tftp.xml
+++ b/nl/install-methods/install-tftp.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 61147 untranslated -->
+<!-- original version: 62454 untranslated -->
<sect1 condition="supports-tftp" id="install-tftp">
<title>Preparing Files for TFTP Net Booting</title>
@@ -53,34 +53,33 @@ this section, we shall provide commands for SunOS 4.x, SunOS 5.x
<note arch="x86"><para>
-To use the Pre-boot Execution Environment (PXE) method of TFTP
-booting, you will need a TFTP server with <userinput>tsize</userinput>
-support. On a &debian; server, the <classname>atftpd</classname> and
-<classname>tftpd-hpa</classname> packages qualify; we recommend
-<classname>tftpd-hpa</classname>.
+For a &debian; server we recommend <classname>tftpd-hpa</classname>.
+It's written by the same author as the <classname>syslinux</classname>
+bootloader and is therefore least likely to cause issues.
+A good alternative is <classname>atftpd</classname>.
</para></note>
</para>
&tftp-rarp.xml;
-&tftp-bootp.xml;
&tftp-dhcp.xml;
+&tftp-bootp.xml;
<sect2 id="tftpd">
<title>Enabling the TFTP Server</title>
<para>
To get the TFTP server ready to go, you should first make sure that
-<command>tftpd</command> is enabled. This is usually enabled by having
-something like the following line in <filename>/etc/inetd.conf</filename>:
+<command>tftpd</command> is enabled.
-<informalexample><screen>
-tftp dgram udp wait nobody /usr/sbin/tcpd in.tftpd /tftpboot
-</screen></informalexample>
+</para><para>
-Debian packages will in general set this up correctly by default when they
-are installed.
+In the case of <classname>tftpd-hpa</classname> there are two ways the
+service can be run. It can be started on demand by the system's
+<classname>inetd</classname> daemon, or it can be set up to run as an
+independent daemon. Which of these methods is used is selected when the
+package is installed and can be changed by reconfiguring the package.
</para>
<note><para>
@@ -95,23 +94,11 @@ configuration examples in this section accordingly.
</para></note>
<para>
-Look in <filename>/etc/inetd.conf</filename> and remember the directory which
-is used as the argument of <command>in.tftpd</command><footnote>
-
-<para>
All <command>in.tftpd</command> alternatives available in Debian should
log TFTP requests to the system logs by default. Some of them support a
<userinput>-v</userinput> argument to increase verbosity.
It is recommended to check these log messages in case of boot problems
as they are a good starting point for diagnosing the cause of errors.
-</para>
-
-</footnote>; you'll need that below.
-If you've had to change <filename>/etc/inetd.conf</filename>, you'll have to
-notify the running <command>inetd</command> process that the file has changed.
-On a Debian machine, run <userinput>/etc/init.d/inetd reload</userinput>; on
-other machines, find out the process ID for <command>inetd</command>, and run
-<userinput>kill -HUP <replaceable>inetd-pid</replaceable></userinput>.
</para><para arch="mips">
diff --git a/nl/install-methods/tftp/rarp.xml b/nl/install-methods/tftp/rarp.xml
index e449b79ac..47715f8db 100644
--- a/nl/install-methods/tftp/rarp.xml
+++ b/nl/install-methods/tftp/rarp.xml
@@ -1,6 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 39897 untranslated -->
-
+<!-- original version: 62401 untranslated -->
<sect2 condition="supports-rarp" id="tftp-rarp">
<title>Setting up RARP server</title>
@@ -14,7 +13,7 @@ If you don't know this information, you can
OpenBoot <userinput>.enet-addr</userinput> command, or </phrase>
boot into <quote>Rescue</quote> mode (e.g., from the rescue floppy) and use the
-command <userinput>/sbin/ifconfig eth0</userinput>.
+command <userinput>ip addr show dev eth0</userinput>.
</para><para>
diff --git a/nl/install-methods/usb-setup/x86.xml b/nl/install-methods/usb-setup/x86.xml
index b34dbac4a..5694b170b 100644
--- a/nl/install-methods/usb-setup/x86.xml
+++ b/nl/install-methods/usb-setup/x86.xml
@@ -1,5 +1,5 @@
<!-- retain these comments for translator revision tracking -->
-<!-- original version: 56442 untranslated -->
+<!-- original version: 61286 untranslated -->
<sect3 arch="x86">
<title>Partitioning the USB stick</title>
@@ -13,8 +13,13 @@ instead of the entire device.
Since most USB sticks come pre-configured with a single FAT16
partition, you probably won't have to repartition or reformat the
stick. If you have to do that anyway, use <command>cfdisk</command>
-or any other partitioning tool to create a FAT16 partition, and then
-create the filesystem using:
+or any other partitioning tool to create a FAT16 partition<footnote>
+
+<para>
+Don't forget to set the <quote>bootable</quote> bootable flag.
+</para>
+
+</footnote>, and then create the filesystem using:
<informalexample><screen>
# mkdosfs /dev/<replaceable>sdX1</replaceable>
@@ -63,7 +68,7 @@ and copy the following installer image files to the stick:
<itemizedlist>
<listitem><para>
-<filename>vmlinuz</filename> (kernel binary)
+<filename>vmlinuz</filename> or <filename>linux</filename> (kernel binary)
</para></listitem>
<listitem><para>
@@ -81,7 +86,9 @@ subdirectory. If you want to rename the files, please note that
</para><para>
Next you should create a <filename>syslinux.cfg</filename> configuration
-file, which at a bare minimum should contain the following two lines:
+file, which at a bare minimum should contain the following two lines (change
+the name of the kernel binary to <quote><filename>linux</filename></quote>
+if you used a <filename>netboot</filename> image):
<informalexample><screen>
default vmlinuz
@@ -94,9 +101,17 @@ For the graphical installer you should add
</para><para>
If you used an <filename>hd-media</filename> image, you should now copy a
-Debian ISO image (businesscard, netinst or full CD image; be sure to select
-one that fits) onto the stick. When you are done, unmount the USB memory
-stick (<userinput>umount /mnt</userinput>).
+Debian ISO image<footnote>
+
+<para>
+You can use either a businesscard, a netinst or a full CD image (see
+<xref linkend="official-cdrom"/>). Be sure to select one that fits.
+Note that the <quote>netboot <filename>mini.iso</filename></quote> image is
+not usable for this purpose.
+</para>
+
+</footnote> onto the stick. When you are done, unmount the USB memory stick
+(<userinput>umount /mnt</userinput>).
</para>
</sect3>