diff options
Diffstat (limited to 'en')
| -rw-r--r-- | en/appendix/chroot-install.xml | 25 | ||||
| -rw-r--r-- | en/appendix/preseed.xml | 28 | ||||
| -rw-r--r-- | en/boot-installer/x86.xml | 47 | ||||
| -rw-r--r-- | en/boot-new/boot-new.xml | 4 | ||||
| -rw-r--r-- | en/howto/installation-howto.xml | 4 | ||||
| -rw-r--r-- | en/install-methods/boot-drive-files.xml | 11 | ||||
| -rw-r--r-- | en/install-methods/usb-setup/x86.xml | 2 | ||||
| -rw-r--r-- | en/partitioning/partition/x86.xml | 4 | ||||
| -rw-r--r-- | en/using-d-i/components.xml | 1 | ||||
| -rw-r--r-- | en/using-d-i/modules/partman-md.xml | 2 | ||||
| -rw-r--r-- | en/using-d-i/modules/x86/grub-installer.xml | 7 |
11 files changed, 36 insertions, 99 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) diff --git a/en/boot-installer/x86.xml b/en/boot-installer/x86.xml index 662a83016..f54201c97 100644 --- a/en/boot-installer/x86.xml +++ b/en/boot-installer/x86.xml @@ -95,7 +95,7 @@ The kernel will load and launch the installer system. </sect2> <sect2 arch="x86" id="boot-initrd"> - <title>Booting from Linux using <command>LILO</command> or + <title>Booting from Linux using <command>GRUB</command></title> <para> @@ -123,8 +123,8 @@ and install from the installation image, without needing the network. </para> <para> -For <command>LILO</command>, you will need to configure two -essential things in <filename>/etc/lilo.conf</filename>: +For <command>GRUB2</command>, you will need to configure two +essential things in <filename>/boot/grub/grub.cfg</filename>: <itemizedlist> <listitem><para> @@ -139,43 +139,9 @@ its root partition. </para></listitem> </itemizedlist> -Here is a <filename>/etc/lilo.conf</filename> example: - </para><para> -<informalexample><screen> -image=/boot/newinstall/vmlinuz - label=newinstall - initrd=/boot/newinstall/initrd.gz -</screen></informalexample> - -For more details, refer to the -<citerefentry><refentrytitle>initrd</refentrytitle> -<manvolnum>4</manvolnum></citerefentry> and -<citerefentry><refentrytitle>lilo.conf</refentrytitle> -<manvolnum>5</manvolnum></citerefentry> man pages. Now run -<userinput>lilo</userinput> and reboot. - -</para><para> - -The procedure for <command>GRUB1</command> is quite similar. Locate your -<filename>menu.lst</filename> in the <filename>/boot/grub/</filename> -directory (or sometimes <filename>/boot/boot/grub/</filename>) and add an -entry for the installer, for example (assuming <filename>/boot</filename> -is on the first partition of the first disk in the system): - -<informalexample><screen> -title New Install -root (hd0,0) -kernel /boot/newinstall/vmlinuz -initrd /boot/newinstall/initrd.gz -</screen></informalexample> - -</para><para> - -The procedure for <command>GRUB2</command> is very similar. The file is named -<filename>grub.cfg</filename> instead of <filename>menu.lst</filename>. An entry -for the installer would be for instance for example: +An entry for the installer would be for example: <informalexample><screen> menuentry 'New Install' { @@ -187,11 +153,6 @@ initrd /boot/newinstall/initrd.gz } </screen></informalexample> -</para><para> - -From here on, there should be no difference between <command>GRUB</command> -or <command>LILO</command>. - </para> </sect2> diff --git a/en/boot-new/boot-new.xml b/en/boot-new/boot-new.xml index 5698630b2..cb28aca37 100644 --- a/en/boot-new/boot-new.xml +++ b/en/boot-new/boot-new.xml @@ -13,8 +13,8 @@ call the <quote>smoke test</quote>. </para><para arch="any-x86"> If you did a default installation, the first thing you should see when you -boot the system is the menu of the <classname>grub</classname><phrase arch="x86"> or possibly -the <classname>lilo</classname> bootloader</phrase>. +boot the system is the menu of the <classname>grub</classname> +bootloader. The first choices in the menu will be for your new &debian; system. If you had any other operating systems on your computer (like Windows) that were detected by the installation system, those will be listed lower down in the diff --git a/en/howto/installation-howto.xml b/en/howto/installation-howto.xml index 90165466d..ddd0c3820 100644 --- a/en/howto/installation-howto.xml +++ b/en/howto/installation-howto.xml @@ -275,8 +275,8 @@ See <xref linkend="pkgsel"/> for additional information about this step. The last step is to install a boot loader. If the installer detects other operating systems on your computer, it will add them to the boot menu and let you know. -<phrase arch="any-x86">By default GRUB will be installed to the master boot -record of the first harddrive, which is generally a good choice. You'll be +<phrase arch="any-x86">By default GRUB will be installed to the UEFI partition/boot +record of the primary drive, which is generally a good choice. You'll be given the opportunity to override that choice and install it elsewhere. </phrase> diff --git a/en/install-methods/boot-drive-files.xml b/en/install-methods/boot-drive-files.xml index 8e6707e92..806da3faf 100644 --- a/en/install-methods/boot-drive-files.xml +++ b/en/install-methods/boot-drive-files.xml @@ -34,26 +34,25 @@ depending on whether the system is a <quote>NewWorld</quote> or an </para> - <sect2 arch="x86" id="files-lilo"> - <title>Hard disk installer booting from Linux using <command>LILO</command> or + <sect2 arch="x86" id="files-grub"> + <title>Hard disk installer booting from Linux using <command>GRUB</command></title> <para> This section explains how to add to or even replace an existing linux -installation using either <command>LILO</command> or +installation using <command>GRUB</command>. </para><para> -At boot time, both bootloaders support loading in memory not +At boot time, <command>GRUB</command> supports loading in memory not only the kernel, but also a disk image. This RAM disk can be used as 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 (note that LILO -can not boot from files on an NTFS file system), for instance to +convenient location on your hard drive, for instance to <filename>/boot/newinstall/</filename>. <itemizedlist> diff --git a/en/install-methods/usb-setup/x86.xml b/en/install-methods/usb-setup/x86.xml index fd6947340..569d06a76 100644 --- a/en/install-methods/usb-setup/x86.xml +++ b/en/install-methods/usb-setup/x86.xml @@ -40,7 +40,7 @@ Take care that you use the correct device name for your USB stick. The In order to start the kernel after booting from the USB stick, we will put a boot loader on the stick. Although any boot loader -(e.g. <classname>lilo</classname>) should work, it's convenient to use +should work, it's convenient to use <classname>syslinux</classname>, since it uses a FAT16 partition and can be reconfigured by just editing a text file. Any operating system which supports the FAT file system can be used to make changes to the diff --git a/en/partitioning/partition/x86.xml b/en/partitioning/partition/x86.xml index 6dbc476da..cc6bb0c5e 100644 --- a/en/partitioning/partition/x86.xml +++ b/en/partitioning/partition/x86.xml @@ -56,8 +56,8 @@ must be placed within the first 1024 cylinders of your hard drive This restriction doesn't apply if you have a BIOS newer than around 1995–98 (depending on the manufacturer) that supports the <quote>Enhanced -Disk Drive Support Specification</quote>. Both Lilo, the Linux loader, and -&debian;'s alternative <command>mbr</command> must use the BIOS to read the +Disk Drive Support Specification</quote>. +&debian;'s Lilo alternative <command>mbr</command> must use the BIOS to read the kernel from the disk into RAM. If the BIOS int 0x13 large disk access extensions are found to be present, they will be utilized. Otherwise, the legacy disk access interface is used as a fall-back, and it cannot diff --git a/en/using-d-i/components.xml b/en/using-d-i/components.xml index e1f915c18..702185e97 100644 --- a/en/using-d-i/components.xml +++ b/en/using-d-i/components.xml @@ -148,7 +148,6 @@ linkend="boot-dev-select-sun"/>.</phrase> &module-os-prober.xml; &module-hppa-palo-installer.xml; &module-x86-grub-installer.xml; -&module-x86-lilo-installer.xml; &module-ia64-elilo-installer.xml; &module-mipsel-colo-installer.xml; &module-powerpc-yaboot-installer.xml; diff --git a/en/using-d-i/modules/partman-md.xml b/en/using-d-i/modules/partman-md.xml index 9dffad9f8..c946627df 100644 --- a/en/using-d-i/modules/partman-md.xml +++ b/en/using-d-i/modules/partman-md.xml @@ -217,7 +217,7 @@ Make sure that the system can be booted with the partitioning scheme you are planning. In general it will be necessary to create a separate file system for <filename>/boot</filename> when using RAID for the root (<filename>/</filename>) file system. -Most boot loaders <phrase arch="x86">(including lilo and grub)</phrase> +Most boot loaders <phrase arch="x86">(including grub)</phrase> do support mirrored (not striped!) RAID1, so using for example RAID5 for <filename>/</filename> and RAID1 for <filename>/boot</filename> can be an option. diff --git a/en/using-d-i/modules/x86/grub-installer.xml b/en/using-d-i/modules/x86/grub-installer.xml index c90fa3646..23a4e44c2 100644 --- a/en/using-d-i/modules/x86/grub-installer.xml +++ b/en/using-d-i/modules/x86/grub-installer.xml @@ -3,16 +3,17 @@ <sect3 arch="any-x86"> <title>Install the <command>Grub</command> Boot Loader - on a Hard Disk</title> + on the drive</title> <para> -The main &architecture; boot loader is called <quote>grub</quote>. +The &architecture; boot loader is called <quote>grub</quote>. Grub is a flexible and robust boot loader and a good default choice for new users and old hands alike. </para><para> -By default, grub will be installed into the Master Boot Record (MBR), where +By default, grub will be installed on the UEFI partition/the Boot Record of +the primary drive, where it will take over complete control of the boot process. If you prefer, you can install it elsewhere. See the grub manual for complete information. |