From ef87d135a6c048e13cc4a159f578ce7c59be8ccc Mon Sep 17 00:00:00 2001
From: Samuel Thibault <sthibault@debian.org>
Date: Sun, 5 Sep 2010 21:57:21 +0000
Subject:   * Document booting from DOS (Closes: Bug#518808).

---
 build/entities/common.ent               |  5 ++++
 debian/changelog                        |  3 ++-
 en/boot-installer/x86.xml               | 46 +++++++++++++++++++--------------
 en/install-methods/boot-drive-files.xml | 36 ++++++++++++++++++++++----
 4 files changed, 64 insertions(+), 26 deletions(-)

diff --git a/build/entities/common.ent b/build/entities/common.ent
index 8426edd09..a8b4e83eb 100644
--- a/build/entities/common.ent
+++ b/build/entities/common.ent
@@ -159,6 +159,11 @@ to first switch tasksel to that DE using the following command, e.g:
   append="mcd=0x320,11"
   read-only'>
 
+<!-- CD directory containing the kernel binary and ramdisk image,
+     according to the architecture.  -->
+<!ENTITY x86-install-dir
+   "install.<filename arch='i386'>386</filename><filename arch='amd64'>amd</filename>">
+
 <!-- prefix for files that can be downloaded -->
 <!-- <![ %official-web-build; [ <!ENTITY downloadable-file "&url-boot-floppies;"> ]]> -->
                           <!ENTITY downloadable-file "&url-debian-installer;">
diff --git a/debian/changelog b/debian/changelog
index 25422a785..261173293 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ installation-guide (2010xxxx) UNRELEASED; urgency=low
 
   [ Samuel Thibault ]
   * Update brltty version.
+  * Document booting from DOS (Closes: Bug#518808).
 
- -- Frans Pop <fjp@debian.org>  Tue, 18 May 2010 07:47:53 +0200
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 05 Sep 2010 23:56:10 +0200
 
 installation-guide (20100518) unstable; urgency=low
 
diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml
index 99d471cd8..2a196b6bb 100644
--- a/en/boot-installer/x86.xml
+++ b/en/boot-installer/x86.xml
@@ -95,40 +95,46 @@ asked and the system will be prepared to start the &debian; installer.
 </para>
   </sect2>
 
-<!-- FIXME the documented procedure does not exactly work, commented out
-     until fixes
-
   <sect2 arch="x86" id="install-from-dos">
-  <title>Booting from a DOS partition</title>
+  <title>Booting from DOS</title>
+<para>
 
-&boot-installer-intro-hd.xml;
+Boot into DOS (not Windows).  To do this, you can for instance boot from a
+recovery or diagnostic disk.
 
-<para>
+</para><para>
 
-Boot into DOS (not Windows) without any drivers being loaded.  To do
-this, you have to press <keycap>F8</keycap> at exactly the right
-moment (and optionally select the <quote>safe mode command prompt only</quote>
-option).  Enter the subdirectory for the flavor you chose, e.g.,
+If you can access the installation CD, change the current drive to the CD-ROM
+drive, e.g.
 
 <informalexample><screen>
-cd c:\install
-</screen></informalexample>.
+d:
+</screen></informalexample>
 
-Next, execute <command>install.bat</command>.
-The kernel will load and launch the installer system.
+else make sure you have first prepared your hard disk as explained in
+<xref linkend="files-loadlin"/>, and change the current drive to it if needed.
 
 </para><para>
 
-Please note, there is currently a loadlin problem (#142421) which
-precludes <filename>install.bat</filename> from being used with the
-bf2.4 flavor. The symptom of the problem is an
-<computeroutput>invalid compressed format</computeroutput> error.
+Enter the subdirectory for the flavor you chose, e.g.,
+
+<informalexample><screen>
+cd \&x86-install-dir;
+</screen></informalexample>
+
+If you prefer using the graphical installer, enter the <filename>gtk</filename>
+sub-directory.
+
+<informalexample><screen>
+cd gtk
+</screen></informalexample>
+
+Next, execute <command>install.bat</command>.
+The kernel will load and launch the installer system.
 
 </para>
   </sect2>
 
-END FIXME -->
-
   <sect2 arch="x86" id="boot-initrd">
   <title>Booting from Linux Using <command>LILO</command> or
   <command>GRUB</command></title>
diff --git a/en/install-methods/boot-drive-files.xml b/en/install-methods/boot-drive-files.xml
index 22f9b3a2d..52e8df824 100644
--- a/en/install-methods/boot-drive-files.xml
+++ b/en/install-methods/boot-drive-files.xml
@@ -16,10 +16,6 @@ technique. This avoids all hassles of removable media, like finding
 and burning CD images or struggling with too numerous and
 unreliable floppy disks.
 
-</para><para arch="x86">
-
-The installer cannot boot from files on an NTFS file system.
-
 </para><para arch="powerpc">
 
 The installer cannot boot from files on an HFS+ file system.  MacOS
@@ -57,7 +53,8 @@ the root file-system by the kernel.
 </para><para>
 
 Copy the following files from the Debian archives to a
-convenient location on your hard drive, for instance to
+convenient location on your hard drive (note that LILO
+can not boot from files on an NTFS file system), for instance to
 <filename>/boot/newinstall/</filename>.
 
 <itemizedlist>
@@ -82,6 +79,35 @@ Finally, to configure the bootloader proceed to
   </sect2>
 
 
+  <sect2 arch="x86" id="files-loadlin">
+  <title>Hard disk installer booting using <command>loadlin</command></title>
+<para>
+
+This section explains how to prepare your hard drive for booting the installer
+from DOS using <command>loadlin</command>.
+
+</para><para>
+
+Copy the following files from a Debian CD image to <filename>c:\</filename>.
+
+<itemizedlist>
+<listitem><para>
+
+<filename>/&x86-install-dir;</filename> (kernel binary and ramdisk image)
+
+</para></listitem>
+<listitem><para>
+
+<filename>/tools</filename> (loadlin tool)
+
+</para></listitem>
+
+</itemizedlist>
+
+</para>
+  </sect2>
+
+
   <sect2 arch="powerpc" id="files-oldworld">
   <title>Hard Disk Installer Booting for OldWorld Macs</title>
 <para>
-- 
cgit v1.2.3