summaryrefslogtreecommitdiff
path: root/en
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2010-09-18 13:04:33 +0000
committerSamuel Thibault <sthibault@debian.org>2010-09-18 13:04:33 +0000
commit9e62dc7ae8d3cfaf356394e2cc65f199826401b8 (patch)
tree0ed791515afa7e8549989c2fc6e43a7a20f774cf /en
parent7488015212d12b391cd1fbc393ce93c75c72b60c (diff)
downloadinstallation-guide-9e62dc7ae8d3cfaf356394e2cc65f199826401b8.zip
Drop lilo documentation from non-linux archs.
Diffstat (limited to 'en')
-rw-r--r--en/appendix/chroot-install.xml12
-rw-r--r--en/appendix/preseed.xml6
2 files changed, 10 insertions, 8 deletions
diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml
index a5e13fbaa..c74a27583 100644
--- a/en/appendix/chroot-install.xml
+++ b/en/appendix/chroot-install.xml
@@ -549,15 +549,15 @@ can use <command>aptitude</command> inside your Debian chroot to do so.
</para><para arch="any-x86">
-Check <userinput>info grub</userinput> or <userinput>man
-lilo.conf</userinput> for instructions on setting up the
+Check <userinput>info grub</userinput> <phrase arch="x86">or <userinput>man
+lilo.conf</userinput></phrase> 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 grub
-<filename>menu.lst</filename> or <filename>lilo.conf</filename>. For
+<filename>menu.lst</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).
+<filename>lilo.conf</filename> relative to the system you call it from)</phrase>.
</para><para arch="any-x86">
@@ -611,8 +611,8 @@ postinst_hook = update-grub
postrm_hook = update-grub
</screen></informalexample>
-For the <classname>lilo</classname> bootloader, the value of
-<literal>do_bootloader</literal> needs to remain <quote>yes</quote>.
+<phrase arch="x86">For the <classname>lilo</classname> bootloader, the value of
+<literal>do_bootloader</literal> needs to remain <quote>yes</quote>.</phrase>
</para><para arch="powerpc">
diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml
index 5139dd54a..6fc558bf4 100644
--- a/en/appendix/preseed.xml
+++ b/en/appendix/preseed.xml
@@ -1411,12 +1411,14 @@ to be used easily on the kernel command line as well.
<title>Boot loader installation</title>
<informalexample role="example"><screen>
-# Grub is the default boot loader (for x86). If you want lilo installed
+<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
+#d-i lilo-installer/skip boolean true</phrase>
+<phrase arch="kfreebsd-any;hurd-any"># To install no bootloader, uncomment this
+#d-i grub-installer/skip boolean true</phrase>
# With a few exceptions for unusual partitioning setups, GRUB 2 is now the
# default. If you need GRUB Legacy for some particular reason, then