From 24e359426da9bb7f2585c130ead8a269767ba7e2 Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Wed, 4 Jul 2012 04:06:34 +0000
Subject: Fix flexible USB key documentation details

  * Document that flexible-built USB keys do not show the boot menu by
    default, and document how to enable it. Thanks Filipus Klutiero for the
    report. Closes: #666105.
  * Document that installing an MBR is needed to get a bootable USB key.
---
 debian/changelog                     |  4 ++++
 en/boot-installer/x86.xml            |  7 ++++---
 en/install-methods/usb-setup/x86.xml | 17 ++++++++++++++---
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ec5dc550d..6d98c772c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,10 @@ installation-guide (2011xxxx) UNRELEASED; urgency=low
   * Simply use cp instead of dd to prepare USB stick.
   * Remove heading / from pxelinux.0, it seems to pose problem with some
     implementations. Thanks Ulrich Krause for the report.
+  * Document that flexible-built USB keys do not show the boot menu by
+    default, and document how to enable it. Thanks Filipus Klutiero for the
+    report. Closes: #666105.
+  * Document that installing an MBR is needed to get a bootable USB key.
 
   [ Steve McIntyre ]
   * Make it clearer how we expect users to write CDs to USB sticks.
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 2c7557847..5295946e9 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -257,9 +257,10 @@ or <command>LILO</command>.
 Let's assume you have prepared everything from <xref
 linkend="boot-dev-select"/> and <xref linkend="boot-usb-files"/>.  Now
 just plug your USB stick into some free USB connector and reboot the
-computer.  The system should boot up, and you should be presented with
-the <prompt>boot:</prompt> prompt.  Here you can enter optional boot
-arguments, or just hit &enterkey;.
+computer.  The system should boot up, and unless you have used the flexible
+way to build the stick and not enabled it, you should be presented with the
+<prompt>boot:</prompt> prompt.  Here you can enter optional boot arguments, or
+just hit &enterkey;.
 
 </para>
   </sect2>
diff --git a/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml
index aa3837de7..78011771e 100644
--- a/en/install-methods/usb-setup/x86.xml
+++ b/en/install-methods/usb-setup/x86.xml
@@ -19,7 +19,13 @@ or any other partitioning tool to create a FAT16 partition<footnote>
 Don't forget to set the <quote>bootable</quote> bootable flag.
 </para>
 
-</footnote>, and then create the filesystem using:
+</footnote>, install an MBR using:
+
+<informalexample><screen>
+# install-mbr /dev/<replaceable>sdX</replaceable>
+</screen></informalexample>
+
+and then create the filesystem using:
 
 <informalexample><screen>
 # mkdosfs /dev/<replaceable>sdX1</replaceable>
@@ -95,8 +101,13 @@ default vmlinuz
 append initrd=initrd.gz
 </screen></informalexample>
 
-For the graphical installer you should add
-<userinput>vga=788</userinput> to the second line.
+For the graphical installer you should add <userinput>vga=788</userinput> to the
+second line. Other parameters can be appended as desired.
+
+</para><para>
+
+To enable the boot prompt to permit further parameter appending, add a
+<userinput>prompt 1</userinput> line.
 
 </para><para>
 
-- 
cgit v1.2.3