summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rw-r--r--en/install-methods/boot-usb-files.xml39
2 files changed, 30 insertions, 13 deletions
diff --git a/debian/changelog b/debian/changelog
index b76e655d9..3e76ca75f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,10 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
* Fix hardware part for non-Linux ports. Now needs fine-tune from BSD
people.
+ [ Joey Hess ]
+ * Update USB stick documentation to reflect isohybird mini.iso files,
+ as generated by debian-installer >= 20100913.
+
-- Samuel Thibault <sthibault@debian.org> Mon, 06 Sep 2010 00:56:02 +0200
installation-guide (20100518) unstable; urgency=low
diff --git a/en/install-methods/boot-usb-files.xml b/en/install-methods/boot-usb-files.xml
index f8c948147..e2fc9af18 100644
--- a/en/install-methods/boot-usb-files.xml
+++ b/en/install-methods/boot-usb-files.xml
@@ -4,26 +4,39 @@
<sect1 condition="bootable-usb" id="boot-usb-files">
<title>Preparing Files for USB Memory Stick Booting</title>
-<para>
+<para><para arch="x86">
There are two installation methods possible when booting from USB stick.
-The first is to install completely from the network. The second is to
-also copy a CD image onto the USB stick and use that as a source for
-packages, possibly in combination with a mirror. This second method is
-the more common.
+The first is to only use the USB stick to boot the installer, and then
+install completely from the network. The second is to also copy a CD image
+onto the USB stick and use that as a source for packages, possibly in
+combination with a mirror.
-</para><para>
+</para><para arch="x86">
+
+To prepare a USB stick that only boots the installer, which then proceeds
+to install entirely from the network, you'll need to download the
+<filename>mini.iso</filename> image from the <filename>netboot</filename>
+directory (at the location mentioned in <xref linkend="where-files"/>), and
+write this file directly to the USB stick, overwriting its current contents.
+
+</para><para arch="x86">
+
+For example, when using an existing GNU/Linux system, the
+<filename>mini.iso</filename> file can be written to a USB stick as follows:
+
+<informalexample><screen>
+# cat mini.iso &gt; /dev/<replaceable>sdX</replaceable>
+</screen></informalexample>
-For the first installation method you'll need to download an installer
-image from the <filename>netboot</filename> directory (at the location
-mentioned in <xref linkend="where-files"/>) and use the
-<quote>flexible way</quote> explained below to copy the files to the USB
-stick.
+This method will work with very small USB sticks, only a few megabytes in
+size.
</para><para>
-Installation images for the second installation method can be found in
-the <filename>hd-media</filename> directory and either the <quote>easy
+To prepare a USB stick that installs packages from a CD image included
+on the stick, use the installer images found in the
+<filename>hd-media</filename> directory. Either the <quote>easy
way</quote> or the <quote>flexible way</quote> can be used to copy the
image to the USB stick. For this installation method you will also need
to download a CD image. The installation image and the CD image must be