Overhaul of chapter 'Preparing Files for USB Memory Stick Booting'

2 files changed, 111 insertions, 65 deletions

diff --git a/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml
index 64aeb0aff..062aed26f 100644
--- a/en/install-methods/boot-usb-files.xml
+++ b/en/install-methods/boot-usb-files.xml
@@ -13,8 +13,10 @@ it is not you should check that the usb-storage kernel module is loaded.
 When the USB stick is inserted, it will be mapped to a device named
 <filename>/dev/sdX</filename>, where the <quote>X</quote> is a letter
 in the range a-z. You should be able to see to which device the USB
-stick was mapped by running the command <command>dmesg</command> after
-inserting it. To write to your stick, you may have to turn off its write
+stick was mapped by running the command <command>lsblk</command> before
+and after inserting it. (The output of <command>dmesg</command> (as root) is
+another possible method for that.)
+To write to your stick, you may have to turn off its write
 protection switch.
 
 </para><warning><para>
@@ -22,7 +24,7 @@ protection switch.
 The procedures described in this section will destroy anything already
 on the device! Make very sure that you use the correct device name for
 your USB stick. If you use the wrong device the result could be that all
-information on for example a hard disk could be lost.
+information on, for example, a hard disk is lost.
 
 </para></warning>
 
@@ -30,9 +32,11 @@ information on for example a hard disk could be lost.
   <title>Preparing a USB stick using a hybrid CD/DVD image</title>
 <para>
 
-Debian installation images can now be written directly to a USB stick,
-which is a very easy way to make a bootable USB stick. Simply choose
-an image (such as the netinst, CD, DVD-1, or netboot) that will fit
+Debian installation images for this architecture are created using the
+<command>isohybrid</command> technology;
+that means they can be written directly to a USB stick,
+which is a very easy way to make an installation media. Simply choose
+an image (such as the netinst, CD or DVD-1) that will fit
 on your USB stick. See
 <xref linkend="official-cdrom"/> to get an installation image.
 
@@ -82,25 +86,31 @@ device.
 
 </para><para>
 
-Create a second, FAT partition on the stick, mount the partition
-and copy or unpack the firmware onto it. For example:
+To do so, use cfdisk or any other partitioning tool to create an additional
+partition on the stick. Then create a (FAT) filesystem on the partition,
+mount it and copy or unpack the firmware onto it, for example with:
 
 <informalexample><screen>
-# mount /dev/<replaceable>sdX2</replaceable> /mnt
+# mkdosfs -n FIRMWARE /dev/sdX3
+# mount /dev/<replaceable>sdX3</replaceable> /mnt
 # cd /mnt
 # tar zxvf <replaceable>/path/to/</replaceable>firmware.tar.gz
 # cd /
 # umount /mnt
 </screen></informalexample>
 
-</para><para arch="not-s390">
+Take care that you use the correct device name for your USB stick. The
+<command>mkdosfs</command> command is contained in the
+<classname>dosfstools</classname> &debian; package.
 
-You might have written the <filename>mini.iso</filename> to the USB
-stick. In this case the second partition doesn't have to be created as,
-very nicely, it will already be present. Unplugging and replugging the
+</para><note><para arch="not-s390">
+
+If you have chosen the <filename>mini.iso</filename> to be written to the USB
+stick, the second partition doesn't have to be created, as -
+very nicely - it will already be present. Unplugging and replugging the
 USB stick should make the two partitions visible.
 
-</para>
+</para></note>
 
 
 
@@ -110,21 +120,32 @@ USB stick should make the two partitions visible.
   <title>Manually copying files to the USB stick</title>
 <para>
 
-An alternative way to set up your USB stick is to manually copy
-the installer files, and also an installation image to it.
+Prior to isohybrid technology being used for &debian; installation images, the
+methods documented in the chapters below were used to prepare media for
+booting from USB devices.
+These have been superseded by the technique in <xref linkend="usb-copy-isohybrid"/>,
+but have been left here for educational and historical purposes and in case they
+are useful to some user.
+
+</para><para>
+
+An alternative to the method described in
+<xref linkend="usb-copy-isohybrid"/> is to manually copy
+the installer files, and also an installation image to the stick.
 Note that the USB stick should be at least 1 GB in size (smaller
-setups are possible if you follow <xref linkend="usb-copy-flexible"/>).
+setups are possible using the files from netboot, following
+<xref linkend="usb-copy-flexible"/>).
 
 </para><para>
 
 There is an all-in-one file &hdmedia-boot-img;
-which contains all the installer files (including the kernel)
-<phrase arch="x86">as well as <classname>syslinux</classname> and its
-configuration file</phrase>
-<phrase arch="powerpc">as well as <classname>yaboot</classname> and its
+which contains all the installer files (including the
+kernel)<phrase arch="x86"> as well as <classname>syslinux</classname> and its
+configuration file</phrase><phrase arch="powerpc"> as well as
+<classname>yaboot</classname> and its
 configuration file</phrase>.
 
-</para><para>
+</para><note><para>
 
 Note that, although convenient, this method does have one major
 disadvantage: the logical size of the device will be limited to 1 GB,
@@ -132,9 +153,9 @@ even if the capacity of the USB stick is larger. You will need to
 repartition the USB stick and create new file systems to get its full
 capacity back if you ever want to use it for some different purpose.
 
-</para><para arch="x86">
+</para></note><para arch="x86">
 
-To use this image simply extract it directly to your USB stick:
+Simply extract this image directly to your USB stick:
 
 <informalexample><screen>
 # zcat boot.img.gz &gt; /dev/<replaceable>sdX</replaceable>
@@ -160,7 +181,8 @@ After that, mount the USB memory stick
 which will now have
 <phrase arch="x86">a FAT filesystem</phrase>
 <phrase arch="powerpc">an HFS filesystem</phrase>
-on it, and copy a &debian; ISO image (netinst or full CD/DVD) to it.
+on it, and copy a &debian; ISO image (netinst or full CD; see
+<xref linkend="official-cdrom"/>) to it.
 Unmount the stick (<userinput>umount /mnt</userinput>) and you are done.
 
 </para>
diff --git a/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml
index 569d06a76..a1448d311 100644
--- a/en/install-methods/usb-setup/x86.xml
+++ b/en/install-methods/usb-setup/x86.xml
@@ -2,31 +2,45 @@
 <!-- $Id$ -->
 
    <sect3 arch="x86">
-   <title>Partitioning the USB stick</title>
+   <title>Partitioning and adding a boot loader</title>
 <para>
 
 We will show how to set up the memory stick to use the first partition,
 instead of the entire device.
 
+</para><para>
+
+In order to start the kernel after booting from the USB stick, we will
+put a boot loader on the stick. Although any boot loader
+should work, it's convenient to use
+<classname>syslinux</classname>, since it uses a FAT16 partition and can
+be reconfigured by just editing a text file. Any operating system
+which supports the FAT file system can be used to make changes to the
+configuration of the boot loader.
+
+</para><para>
+
+First, you need to install the <classname>syslinux</classname> and
+<classname>mtools</classname> packages on your system.
+
 </para><note><para>
 
 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<footnote>
+or any other partitioning tool to create a FAT16 partition now<footnote>
 
 <para>
-Don't forget to set the <quote>bootable</quote> bootable flag.
+Don't forget to activate the <quote>bootable</quote> flag.
 </para>
 
-</footnote>, install an MBR using:
+</footnote>, and then install an MBR using:
 
 <informalexample><screen>
-# install-mbr /dev/<replaceable>sdX</replaceable>
+# cat /usr/lib/syslinux/mbr/mbr.bin >/dev/<replaceable>sdX</replaceable>
 </screen></informalexample>
 
-The <command>install-mbr</command> command is contained in the
-<classname>mbr</classname> &debian; package.  Then create the filesystem using:
+Now create the filesystem using:
 
 <informalexample><screen>
 # mkdosfs /dev/<replaceable>sdX1</replaceable>
@@ -38,19 +52,8 @@ Take care that you use the correct device name for your USB stick. The
 
 </para></note><para>
 
-In order to start the kernel after booting from the USB stick, we will
-put a boot loader on the stick. Although any boot loader
-should work, it's convenient to use
-<classname>syslinux</classname>, since it uses a FAT16 partition and can
-be reconfigured by just editing a text file. Any operating system
-which supports the FAT file system can be used to make changes to the
-configuration of the boot loader.
-
-</para><para>
-
-To put <classname>syslinux</classname> on the FAT16 partition on your USB
-stick, install the <classname>syslinux</classname> and
-<classname>mtools</classname> packages on your system, and do:
+Having a correctly partitioned USB stick (now), you need to put
+<classname>syslinux</classname> on the FAT16 partition with:
 
 <informalexample><screen>
 # syslinux /dev/<replaceable>sdX1</replaceable>
@@ -65,12 +68,20 @@ procedure writes a boot sector to the partition and creates the file
    </sect3>
 
    <sect3 arch="x86">
-   <title>Adding the installer image</title>
+   <title>Adding the installer files</title>
 <para>
 
-Mount the partition
-(<userinput>mount /dev/<replaceable>sdX1</replaceable> /mnt</userinput>)
-and copy the following installer image files to the stick:
+There are two different installation variants to choose here:
+The hd-media variant needs an installation ISO file on the stick,
+to load installer modules and the base system from.
+The netboot installer however will load all that from a &debian; mirror.
+
+</para><para>
+
+According to your choice, you have to download some installer files from
+the hd-media or netboot subdirectory of
+<ulink url="&url-debian-installer;images">debian/dists/&releasename;/main/installer-&architecture;/current/images/</ulink>
+on any &debian; mirror:   
 
 <itemizedlist>
 <listitem><para>
@@ -85,24 +96,34 @@ and copy the following installer image files to the stick:
 </para></listitem>
 </itemizedlist>
 
-You can choose between either the text-based or the graphical version
-of the installer. The latter can be found in the <filename>gtk</filename>
-subdirectory. If you want to rename the files, please note that
-<classname>syslinux</classname> can only process DOS (8.3) file names.
+You can choose between either the text-based version of the installer (the
+files can be found directly in hd-media or netboot) or the graphical
+version (look in the respective <filename>gtk</filename> subdirectories).
+
+</para><para>
+
+Then mount the partition
+(<userinput>mount /dev/<replaceable>sdX1</replaceable> /mnt</userinput>)
+and copy the downloaded files to the root directory of the stick.
 
 </para><para>
 
-Next you should create a <filename>syslinux.cfg</filename> configuration
-file, which at a bare minimum should contain the following line (change
-the name of the kernel binary to <quote><filename>linux</filename></quote>
-if you used a <filename>netboot</filename> image):
+Next you should create a text file named <filename>syslinux.cfg</filename> 
+in the root directory of the stick as configuration file for syslinux, which at
+a bare minimum should contain the following line:
 
 <informalexample><screen>
 default vmlinuz initrd=initrd.gz
 </screen></informalexample>
 
-For the graphical installer you should add <userinput>vga=788</userinput> to the
-line. Other parameters can be appended as desired.
+Change the name of the kernel binary to <quote><filename>linux</filename></quote>
+if you used files from <filename>netboot</filename>.
+
+</para><para>
+
+For the graphical installer (from <filename>gtk</filename>) you should add
+<userinput>vga=788</userinput> at the end of the line. Other parameters can be
+appended as desired.
 
 </para><para>
 
@@ -111,17 +132,20 @@ To enable the boot prompt to permit further parameter appending, add a
 
 </para><para>
 
-If you used an <filename>hd-media</filename> image, you should now copy the ISO file of a
-&debian; ISO image<footnote>
+If you used files from <filename>hd-media</filename>, you should now copy the
+ISO file of a &debian; installation image onto the stick. (For the
+<filename>netboot</filename> variant this is not needed.)
+
+</para><para>
 
-<para>
 You can use either a netinst or a full CD/DVD image (see
-<xref linkend="official-cdrom"/>). Be sure to select one that fits.
+<xref linkend="official-cdrom"/>). Be sure to select one that fits on your stick.
 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
+</para><para>
+
+When you are done, unmount the USB memory stick
 (<userinput>umount /mnt</userinput>).
 
 </para>