Update manual regarding the latest bootloader changings (removal of lilo + globally changing the term 'Installing GRUB on a harddisk' into 'Installing GRUB on the primary drive')

2 files changed, 15 insertions, 38 deletions

diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index 9c388fd20..04da5da93 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -556,15 +556,11 @@ can use <command>apt</command> inside your &debian; chroot to do so.
 
 </para><para arch="any-x86">
 
-Check <userinput>info grub</userinput> <phrase arch="x86">or <userinput>man
-lilo.conf</userinput></phrase> for instructions on setting up the
+Check <userinput>info grub</userinput>
+for instructions on setting up the
 bootloader.  If you are keeping the system you used to install &debian;, just
 add an entry for the &debian; install to your existing grub2
-<filename>grub.cfg</filename><phrase arch="x86"> or <filename>lilo.conf</filename>.  For
-<filename>lilo.conf</filename>, you could also copy it to the new system and
-edit it there. After you are done editing, call <command>lilo</command>
-(remember it will use
-<filename>lilo.conf</filename> relative to the system you call it from)</phrase>.
+<filename>grub.cfg</filename>.
 
 </para><para arch="any-x86">
 
@@ -586,21 +582,6 @@ Note that this assumes that a <filename>/dev/sda</filename> device file has
 been created. There are alternative methods to install <command>grub2</command>,
 but those are outside the scope of this appendix.
 
-</para><para arch="x86">
-
-Here is a basic <filename>/etc/lilo.conf</filename> as an example:
-
-<informalexample><screen>
-boot=/dev/<replaceable>sda6</replaceable>
-root=/dev/<replaceable>sda6</replaceable>
-install=menu
-delay=20
-lba32
-image=/vmlinuz
-initrd=/initrd.img
-label=Debian
-</screen></informalexample>
-
 </para><para arch="powerpc">
 
 Check <userinput>man yaboot.conf</userinput> for instructions on
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 3d9bf425b..d8495f621 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1487,31 +1487,27 @@ to be used easily on the kernel command line as well.
   <title>Boot loader installation</title>
 
 <informalexample role="example"><screen>
-<phrase arch="linux-any"># Grub is the default boot loader (for x86). If you want lilo installed
-# instead, uncomment this:
-#d-i grub-installer/skip boolean true
-# To also skip installing lilo, and install no bootloader, uncomment this
-# too:
-#d-i lilo-installer/skip boolean true</phrase>
-<phrase arch="kfreebsd-any;hurd-any"># To install no bootloader, uncomment this
+<phrase arch="linux-any"># Grub is the boot loader (for x86).</phrase><phrase
+arch="kfreebsd-any;hurd-any"># To install no bootloader, uncomment this
 #d-i grub-installer/skip boolean true</phrase>
 
-# This is fairly safe to set, it makes grub install automatically to the MBR
-# if no other operating system is detected on the machine.
+# This is fairly safe to set, it makes grub install automatically to the UEFI
+# partition/boot record if no other operating system is detected on the machine.
 d-i grub-installer/only_debian boolean true
 
-# This one makes grub-installer install to the MBR if it also finds some other
-# OS, which is less safe as it might not be able to boot that other OS.
+# This one makes grub-installer install to the UEFI partition/boot record, if
+# it also finds some other OS, which is less safe as it might not be able to
+# boot that other OS.
 d-i grub-installer/with_other_os boolean true
 
-# Due notably to potential USB sticks, the location of the MBR can not be
-# determined safely in general, so this needs to be specified:
+# Due notably to potential USB sticks, the location of the primary drive can
+# not be determined safely in general, so this needs to be specified:
 #d-i grub-installer/bootdev  string /dev/sda
-# To install to the first device (assuming it is not a USB stick):
+# To install to the primary device (assuming it is not a USB stick):
 #d-i grub-installer/bootdev  string default
 
-# Alternatively, if you want to install to a location other than the mbr,
-# uncomment and edit these lines:
+# Alternatively, if you want to install to a location other than the UEFI
+# parition/boot record, uncomment and edit these lines:
 #d-i grub-installer/only_debian boolean false
 #d-i grub-installer/with_other_os boolean false
 #d-i grub-installer/bootdev  string (hd0,1)