diff options
33 files changed, 140 insertions, 349 deletions
diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml index d51cda4fe..5328e7c34 100644 --- a/appendixa/appendixa.xml +++ b/appendixa/appendixa.xml @@ -6,7 +6,6 @@ &aa-autoconf; &aa-automake; &aa-bash; -&aa-bin86; &aa-binutils; &aa-bison; &aa-bzip2; @@ -23,6 +22,7 @@ &aa-glibc; &aa-grep; &aa-groff; +&aa-grub; &aa-gzip; &aa-inetutils; &aa-kbd; @@ -30,7 +30,6 @@ &aa-bootscripts; &aa-lfs-utils; &aa-libtool; -&aa-lilo; &aa-kernel; &aa-m4; &aa-make; diff --git a/appendixa/bin86-dep.xml b/appendixa/bin86-dep.xml deleted file mode 100644 index 753bf8b97..000000000 --- a/appendixa/bin86-dep.xml +++ /dev/null @@ -1,16 +0,0 @@ -<sect2><title> </title><para> </para></sect2> - -<sect2> -<title>Bin86 Installation Dependencies</title> - -<para>(Last checked against version &bin86-depversion;.)</para> - -<literallayout>Bash: sh -Binutils: as, ld, strip -Fileutils: chmod, install, ln, mv -Gcc: cc, cc1, collect2, cpp0 -Make: make -Sed: sed</literallayout> - -</sect2> - diff --git a/appendixa/bin86-desc.xml b/appendixa/bin86-desc.xml deleted file mode 100644 index a3aae9a71..000000000 --- a/appendixa/bin86-desc.xml +++ /dev/null @@ -1,34 +0,0 @@ -<sect2><title> </title><para> </para></sect2> - -<sect2><title>Descriptions</title> - -<para>(Last checked against version &bin86-contversion;.)</para> - -<sect3><title>Program file descriptions</title> - -<sect4><title>as86</title> -<para>as86 is an assembler for the 8086...80386 -processors.</para></sect4> - -<sect4><title>as86_encap</title> -<para>as86_encap is a shell script to call as86 and convert the created binary -into a C file prog.v to be included in or linked with programs like boot -block installers.</para></sect4> - -<sect4><title>ld86</title> -<para>ld86 understands only the object files produced by the as86 assembler. It -can link them into either an impure or a -separate I&D executable.</para></sect4> - -<sect4><title>nm86</title> -<para>The symbol table of the binary file.</para></sect4> - -<sect4><title>objdump86</title> -<para>Dumps detailed information about a binary file.</para></sect4> - -<sect4><title>size86</title> -<para>Summary sizes of the data in a binary file.</para></sect4> - -</sect3> - -</sect2> diff --git a/appendixa/bin86-down.xml b/appendixa/bin86-down.xml deleted file mode 100644 index eb0d392f2..000000000 --- a/appendixa/bin86-down.xml +++ /dev/null @@ -1,7 +0,0 @@ -<sect2> -<title>Official Download Location</title> - -<para><literallayout>Bin86 (&bin86-version;): -<ulink url="http://www.cix.co.uk/~mayday/"/></literallayout></para> -</sect2> - diff --git a/appendixa/bin86-shortdesc.xml b/appendixa/bin86-shortdesc.xml deleted file mode 100644 index ff3558b9a..000000000 --- a/appendixa/bin86-shortdesc.xml +++ /dev/null @@ -1,14 +0,0 @@ -<sect2><title>Contents of Bin86</title> - -<para>(Last checked against version &bin86-contversion;.)</para> - -<para>Bin86 is a simple assembler and linker for 8086 - 80386 machine - code.</para> - -<para>Bin86 installs the following:</para> - -<sect3><title>Program Files</title> -<para>as86, as86_encap, ld86, nm86 (link to objdump86), objdump86 and -size86 (link to objdump86)</para></sect3> - -</sect2> diff --git a/appendixa/bin86.xml b/appendixa/bin86.xml deleted file mode 100644 index e94c6fa4d..000000000 --- a/appendixa/bin86.xml +++ /dev/null @@ -1,13 +0,0 @@ -<sect1 id="aa-bin86" xreflabel="Bin86"> -<title>Bin86</title> -<?dbhtml filename="bin86.html" dir="appendixa"?> - -<para>For installation instructions see <xref linkend="ch06-bin86"/>.</para> - -&aa-bin86-down; -&aa-bin86-shortdesc; -&aa-bin86-desc; -&aa-bin86-dep; - -</sect1> - diff --git a/appendixa/grub-dep.xml b/appendixa/grub-dep.xml new file mode 100644 index 000000000..70d9a27bb --- /dev/null +++ b/appendixa/grub-dep.xml @@ -0,0 +1,9 @@ +<sect2><title> </title><para> </para></sect2> + +<sect2> +<title>Grub Installation Dependencies</title> + +<literallayout>(To be determined)</literallayout> + +</sect2> + diff --git a/appendixa/grub-desc.xml b/appendixa/grub-desc.xml new file mode 100644 index 000000000..a65ab0849 --- /dev/null +++ b/appendixa/grub-desc.xml @@ -0,0 +1,7 @@ +<sect2><title> </title><para> </para></sect2> + +<sect2><title>Descriptions</title> + +<para>(To be determined)</para> + +</sect2> diff --git a/appendixa/grub-down.xml b/appendixa/grub-down.xml new file mode 100644 index 000000000..986e0ba0b --- /dev/null +++ b/appendixa/grub-down.xml @@ -0,0 +1,7 @@ +<sect2> +<title>Official Download Location</title> + +<para><literallayout>Grub (&grub-version;): +<ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/> +</literallayout></para> +</sect2> diff --git a/appendixa/grub-shortdesc.xml b/appendixa/grub-shortdesc.xml new file mode 100644 index 000000000..194130d1f --- /dev/null +++ b/appendixa/grub-shortdesc.xml @@ -0,0 +1,5 @@ +<sect2><title>Contents of Grub</title> + +<para>(To be determined)</para> + +</sect2> diff --git a/appendixa/grub.xml b/appendixa/grub.xml new file mode 100644 index 000000000..1d109a7a8 --- /dev/null +++ b/appendixa/grub.xml @@ -0,0 +1,13 @@ +<sect1 id="aa-grub" xreflabel="Grub"> +<title>Grub</title> +<?dbhtml filename="grub.html" dir="appendixa"?> + +<para>For installation instructions see <xref linkend="ch06-grub"/>.</para> + +&aa-grub-down; +&aa-grub-shortdesc; +&aa-grub-desc; +&aa-grub-dep; + +</sect1> + diff --git a/appendixa/lilo-dep.xml b/appendixa/lilo-dep.xml deleted file mode 100644 index 5359a59e0..000000000 --- a/appendixa/lilo-dep.xml +++ /dev/null @@ -1,18 +0,0 @@ -<sect2><title> </title><para> </para></sect2> - -<sect2> -<title>Lilo Installation Dependencies</title> - -<para>(Last checked against version &lilo-depversion;.)</para> - -<literallayout>Bash: sh -Bin86: as86, ld86 -Binutils: as, ld, strip -Fileutils: cp, dd, ln -Gcc: cc, cc1, collect2, cpp0 -Make: make -Sed: sed -Textutils: cat</literallayout> - -</sect2> - diff --git a/appendixa/lilo-desc.xml b/appendixa/lilo-desc.xml deleted file mode 100644 index 26ee78806..000000000 --- a/appendixa/lilo-desc.xml +++ /dev/null @@ -1,23 +0,0 @@ -<sect2><title> </title><para> </para></sect2> - -<sect2><title>Descriptions</title> - -<para>(Last checked against version &lilo-contversion;.)</para> - -<sect3><title>Program file descriptions</title> - -<sect4><title>lilo</title> -<para>lilo installs the Linux boot loader which is used to start a Linux -system.</para></sect4> - -<sect4><title>mkrescue</title> -<para>mkrescue makes a bootable rescue floppy using the existing kernel -and any initial ramdisk.</para></sect4> - -<sect4><title>keytab-lilo.pl</title> -<para>keytab-lilo.pl compiles keytable definitions into a format which -lilo can use in order to set the keyboard type during boot.</para></sect4> - -</sect3> - -</sect2> diff --git a/appendixa/lilo-down.xml b/appendixa/lilo-down.xml deleted file mode 100644 index 8160108fa..000000000 --- a/appendixa/lilo-down.xml +++ /dev/null @@ -1,7 +0,0 @@ -<sect2> -<title>Official Download Location</title> - -<para><literallayout>Lilo (&lilo-version;): -<ulink url="ftp://ibiblio.org/pub/Linux/system/boot/lilo/"/> -<ulink url="http://ibiblio.org/pub/Linux/system/boot/lilo/"/></literallayout></para> -</sect2> diff --git a/appendixa/lilo-shortdesc.xml b/appendixa/lilo-shortdesc.xml deleted file mode 100644 index 4ad9f5712..000000000 --- a/appendixa/lilo-shortdesc.xml +++ /dev/null @@ -1,12 +0,0 @@ -<sect2><title>Contents of Lilo</title> - -<para>(Last checked against version &lilo-contversion;.)</para> - -<para>Lilo is the LInux LOader.</para> - -<para>Lilo installs the following:</para> - -<sect3><title>Program Files</title> -<para>lilo, mkrescue and keytab-lilo.pl</para></sect3> - -</sect2> diff --git a/appendixa/lilo.xml b/appendixa/lilo.xml deleted file mode 100644 index d389a7dab..000000000 --- a/appendixa/lilo.xml +++ /dev/null @@ -1,13 +0,0 @@ -<sect1 id="aa-lilo" xreflabel="Lilo"> -<title>Lilo</title> -<?dbhtml filename="lilo.html" dir="appendixa"?> - -<para>For installation instructions see <xref linkend="ch06-lilo"/>.</para> - -&aa-lilo-down; -&aa-lilo-shortdesc; -&aa-lilo-desc; -&aa-lilo-dep; - -</sect1> - diff --git a/appendixb/appendixb.xml b/appendixb/appendixb.xml index 92247c5ca..c420ab670 100644 --- a/appendixb/appendixb.xml +++ b/appendixb/appendixb.xml @@ -20,8 +20,6 @@ to which it belongs.</para> <listitem><para>arch : <xref linkend="aa-utillinux"/></para></listitem> <listitem><para>arp : <xref linkend="aa-net-tools"/></para></listitem> <listitem><para>as : <xref linkend="aa-binutils"/></para></listitem> -<listitem><para>as86 : <xref linkend="aa-bin86"/></para></listitem> -<listitem><para>as86_encap : <xref linkend="aa-bin86"/></para></listitem> <listitem><para>attrs : <xref linkend="aa-perl"/></para></listitem> <listitem><para>autoconf : <xref linkend="aa-autoconf"/></para></listitem> <listitem><para>autoheader : <xref linkend="aa-autoconf"/></para></listitem> @@ -250,7 +248,6 @@ to which it belongs.</para> <listitem><para>kbdrate : <xref linkend="aa-kbd"/></para></listitem> <listitem><para>kbd_mode : <xref linkend="aa-kbd"/></para></listitem> <listitem><para>kernelversion : <xref linkend="aa-modutils"/></para></listitem> -<listitem><para>keytab-lilo.pl : <xref linkend="aa-lilo"/></para></listitem> <listitem><para>kill : <xref linkend="aa-procps"/></para></listitem> <listitem><para>kill : <xref linkend="aa-coreutils"/></para></listitem> <listitem><para>killall : <xref linkend="aa-psmisc"/></para></listitem> @@ -262,7 +259,6 @@ to which it belongs.</para> <listitem><para>lastlog : <xref linkend="aa-shadow"/></para></listitem> <listitem><para>ld : <xref linkend="aa-binutils"/></para></listitem> <listitem><para>ld.so : <xref linkend="aa-glibc"/></para></listitem> -<listitem><para>ld86 : <xref linkend="aa-bin86"/></para></listitem> <listitem><para>ldconfig : <xref linkend="aa-glibc"/></para></listitem> <listitem><para>ldd : <xref linkend="aa-glibc"/></para></listitem> <listitem><para>lddlibc4 : <xref linkend="aa-glibc"/></para></listitem> @@ -321,7 +317,6 @@ to which it belongs.</para> <listitem><para>libutil : <xref linkend="aa-glibc"/></para></listitem> <listitem><para>libuuid : <xref linkend="aa-e2fsprogs"/></para></listitem> <listitem><para>libz : <xref linkend="aa-zlib"/></para></listitem> -<listitem><para>lilo : <xref linkend="aa-lilo"/></para></listitem> <listitem><para>line : <xref linkend="aa-utillinux"/></para></listitem> <listitem><para>link : <xref linkend="aa-coreutils"/></para></listitem> <listitem><para>linux : <xref linkend="aa-kernel"/></para></listitem> @@ -373,7 +368,6 @@ to which it belongs.</para> <listitem><para>mklost+found : <xref linkend="aa-e2fsprogs"/></para></listitem> <listitem><para>mknod : <xref linkend="aa-coreutils"/></para></listitem> <listitem><para>mkpasswd : <xref linkend="aa-shadow"/></para></listitem> -<listitem><para>mkrescue : <xref linkend="aa-lilo"/></para></listitem> <listitem><para>mkswap : <xref linkend="aa-utillinux"/></para></listitem> <listitem><para>mktemp : <xref linkend="aa-lfs-utils"/></para></listitem> <listitem><para>mk_cmds : <xref linkend="aa-e2fsprogs"/></para></listitem> @@ -413,14 +407,12 @@ to which it belongs.</para> <listitem><para>nisdomainname : <xref linkend="aa-net-tools"/></para></listitem> <listitem><para>nl : <xref linkend="aa-coreutils"/></para></listitem> <listitem><para>nm : <xref linkend="aa-binutils"/></para></listitem> -<listitem><para>nm86 : <xref linkend="aa-bin86"/></para></listitem> <listitem><para>nohup : <xref linkend="aa-coreutils"/></para></listitem> <listitem><para>nroff : <xref linkend="aa-groff"/></para></listitem> <listitem><para>nscd : <xref linkend="aa-glibc"/></para></listitem> <listitem><para>nscd_nischeck : <xref linkend="aa-glibc"/></para></listitem> <listitem><para>objcopy : <xref linkend="aa-binutils"/></para></listitem> <listitem><para>objdump : <xref linkend="aa-binutils"/></para></listitem> -<listitem><para>objdump86 : <xref linkend="aa-bin86"/></para></listitem> <listitem><para>od : <xref linkend="aa-coreutils"/></para></listitem> <listitem><para>oldps : <xref linkend="aa-procps"/></para></listitem> <listitem><para>Opcode : <xref linkend="aa-perl"/></para></listitem> @@ -546,7 +538,6 @@ to which it belongs.</para> <listitem><para>shtags.pl : <xref linkend="aa-vim"/></para></listitem> <listitem><para>shutdown : <xref linkend="aa-sysvinit"/></para></listitem> <listitem><para>size : <xref linkend="aa-binutils"/></para></listitem> -<listitem><para>size86 : <xref linkend="aa-bin86"/></para></listitem> <listitem><para>skill : <xref linkend="aa-procps"/></para></listitem> <listitem><para>slattach : <xref linkend="aa-net-tools"/></para></listitem> <listitem><para>sleep : <xref linkend="aa-coreutils"/></para></listitem> diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a1cea4f90..fef8ac631 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -56,6 +56,8 @@ <listitem><para>gcc-2.95.3-2.patch</para></listitem> <listitem><para>gcc-3.3.1-no_fixincludes-2.patch</para></listitem> <listitem><para>gcc-3.3.1-specs.patch</para></listitem> +<listitem><para>grub-0.93</para></listitem> +<listitem><para>grub-0.93-gcc33-1.patch</para></listitem> <listitem><para>inetutils-1.4.2</para></listitem> <listitem><para>lfs-utils-0.3</para></listitem> <listitem><para>ncurses-5.3-etip.patch</para></listitem> @@ -67,12 +69,14 @@ <listitem><para>Removed: <itemizedlist> +<listitem><para>bin86-0.16.3</para></listitem> <listitem><para>fileutils-4.1</para></listitem> <listitem><para>fileutils-4.1.patch</para></listitem> <listitem><para>findutils-4.1-segfault.patch</para></listitem> <listitem><para>findutils-4.1.patch</para></listitem> <listitem><para>gcc-3.2.3-mmap_test.patch</para></listitem> <listitem><para>gzip-1.2.4b.patch</para></listitem> +<listitem><para>lilo-22.2</para></listitem> <listitem><para>netkit-base-0.17</para></listitem> <listitem><para>sh-utils-2.0</para></listitem> <listitem><para>sh-utils-2.0.patch</para></listitem> @@ -83,6 +87,9 @@ </itemizedlist> </para></listitem> +<listitem><para>September 11th, 2003 [gerard]: Removed Bin86 and LILO and +replaced it with Grub.</para></listitem> + <listitem><para>September 11th, 2003 [jeremy]: Dropped non-toolchain tests to optional actions. Added a note to use the wiki for failed tests.</para></listitem> diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml index 4fe6465cb..e4bf547d9 100644 --- a/chapter04/chapter04.xml +++ b/chapter04/chapter04.xml @@ -54,9 +54,6 @@ Automake (&automake-version;) - &automake-size;: Bash (&bash-version;) - &bash-size;: <ulink url="http://freshmeat.net/projects/gnubash/"/> -Bin86 (&bin86-version;) - &bin86-size;: -<ulink url="http://freshmeat.net/projects/bin86/"/> - Binutils (&binutils-version;) - &binutils-size;: <ulink url="http://freshmeat.net/projects/binutils/"/> @@ -123,6 +120,9 @@ Grep (&grep-version;) - &grep-size;: Groff (&groff-version;) - &groff-size;: <ulink url="http://freshmeat.net/projects/groff/"/> +Grub (&grub-version;) - &grub-size;: +<ulink url="ftp://alpha.gnu.org/pub/gnu/grub/"/> + Gzip (&gzip-version;) - &gzip-size;: <ulink url="ftp://alpha.gnu.org/gnu/gzip/"/> @@ -144,9 +144,6 @@ Lfs-Utils (&lfs-utils-version;) - &lfs-utils-size;: Libtool (&libtool-version;) - &libtool-size;: <ulink url="http://freshmeat.net/projects/libtool/"/> -Lilo (&lilo-version;) - &lilo-size;: -<ulink url="http://freshmeat.net/projects/lilo/"/> - Linux (&kernel-version;) - &kernel-size;: <ulink url="http://freshmeat.net/projects/linux/"/> @@ -271,6 +268,9 @@ GCC Suppress Libiberty Patch: Glibc Sscanf Patch: <ulink url="&http;/glibc-2.3.2-sscanf-1.patch"/> +Grub Patch (&grub-patch-version;) - &grub-patch-size;: +<ulink url="&http;/grub-&grub-patch-version;.patch"/> + Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;: <ulink url="&http;/kbd-&kbd-patch-version;.patch"/> diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml deleted file mode 100644 index ee2fb4c3a..000000000 --- a/chapter06/bin86-inst.xml +++ /dev/null @@ -1,26 +0,0 @@ -<sect2><title> </title><para> </para></sect2> - -<sect2> -<title>Installation of Bin86</title> - -<para>This package is only needed if you decide to use Lilo on your LFS -system. If you're going to use something else like Grub you won't need -bin86. Check the documentation for your favorite boot loader to see if -you need the bin86 package (usually only ld86 and/or as86 from this -package are required).</para> - -<para>Keep in mind, though, that it's not just boot -loaders that use the bin86 package. There is always the chance that some -other package needs programs from this package, so keep that in mind if -you decide to skip this.</para> - -<para>Compile the package:</para> - -<para><screen><userinput>make</userinput></screen></para> - -<para>And install it:</para> - -<para><screen><userinput>make PREFIX=/usr install</userinput></screen></para> - -</sect2> - diff --git a/chapter06/bin86.xml b/chapter06/bin86.xml deleted file mode 100644 index 34b663707..000000000 --- a/chapter06/bin86.xml +++ /dev/null @@ -1,12 +0,0 @@ -<sect1 id="ch06-bin86"> -<title>Installing Bin86-&bin86-version;</title> -<?dbhtml filename="bin86.html" dir="chapter06"?> - -<screen>Estimated build time: &bin86-time; -Estimated required disk space: &bin86-compsize;</screen> - -&aa-bin86-shortdesc; -&aa-bin86-dep; -&c6-bin86-inst; - -</sect1> diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index b4d9ad8a9..fc943e5f6 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -41,16 +41,15 @@ &c6-bash; &c6-file; &c6-libtool; -&c6-bin86; &c6-bzip2; &c6-ed; &c6-kbd; &c6-diffutils; &c6-e2fsprogs; &c6-grep; +&c6-grub; &c6-gzip; &c6-man; -&c6-lilo; &c6-make; &c6-modutils; &c6-patch; diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml new file mode 100644 index 000000000..de889e0d9 --- /dev/null +++ b/chapter06/grub-inst.xml @@ -0,0 +1,36 @@ +<sect2><title> </title><para> </para></sect2> + +<sect2> +<title>Installation of Grub</title> + +<para>Grub needs a patch applied that fixes a compile problem with +GCC-3.3.1:</para> + +<para><screen><userinput>patch -Np1 -i ../grub-&grub-patch-version;.patch</userinput></screen></para> + +<para>Prepare Grub for compilation:</para> + +<para><screen><userinput>./configure --prefix=/usr</userinput></screen></para> + +<para>Compile the package:</para> + +<para><screen><userinput>make</userinput></screen></para> + +<para>And install it:</para> + +<para><screen><userinput>make install +mkdir /boot/grub +cp /usr/share/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen></para> + +<para>Replace <filename class="directory">i386-pc</filename> with whatever +directory is appropriate for your hardware.</para> + +<para>The <filename class="directory">i386-pc</filename> directory also +contains a number of <filename>*stage1_5</filename> files, different ones +for different filesystems. Have a look at the ones available and copy the +appropriate ones to the <filename class="directory">/boot/grub</filename> +directory. Most people will copy the <filename>e2fs_stage1_5</filename> +and/or <filename>reiserfs_stage1_5</filename> files.</para> + +</sect2> + diff --git a/chapter06/grub.xml b/chapter06/grub.xml new file mode 100644 index 000000000..1eadcb226 --- /dev/null +++ b/chapter06/grub.xml @@ -0,0 +1,12 @@ +<sect1 id="ch06-grub"> +<title>Installing Grub-&grub-version;</title> +<?dbhtml filename="grub.html" dir="chapter06"?> + +<screen>Estimated build time: &grub-time; +Estimated required disk space: &grub-compsize;</screen> + +&aa-grub-shortdesc; +&aa-grub-dep; +&c6-grub-inst; + +</sect1> diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml deleted file mode 100644 index 0dc483e5f..000000000 --- a/chapter06/lilo-inst.xml +++ /dev/null @@ -1,28 +0,0 @@ -<sect2><title> </title><para> </para></sect2> - -<sect2> -<title>Installation of Lilo</title> - -<para>We have chosen Lilo as a boot loader because we feel comfortable with it, but you -may wish to choose another. Fabio Fracassi has written a hint on -GRUB, which is available at <ulink url="&hints-root;grub-howto.txt"/>.</para> - -<para>Compile Lilo:</para> - -<para><screen><userinput>make</userinput></screen></para> - -<para>And install it:</para> - -<para><screen><userinput>make install</userinput></screen></para> - -<para>At the end of the installation, a message will appear stating that -<filename>/sbin/lilo</filename> has to be executed. This is pointless because -the <filename>/etc/lilo.conf</filename> file isn't present yet. We will -complete the installation of lilo in Chapter 8.</para> - -<para>The standard LILO prompt, or menu, may be replaced by the -LFS logo or any logo you like. Martin Imobersteg has written a -hint about this, which is located at -<ulink url="&hints-root;bootlogo.txt"/>.</para> - -</sect2> diff --git a/chapter06/lilo.xml b/chapter06/lilo.xml deleted file mode 100644 index fe4e951c6..000000000 --- a/chapter06/lilo.xml +++ /dev/null @@ -1,12 +0,0 @@ -<sect1 id="ch06-lilo"> -<title>Installing Lilo-&lilo-version;</title> -<?dbhtml filename="lilo.html" dir="chapter06"?> - -<screen>Estimated build time: &lilo-time; -Estimated required disk space: &lilo-compsize;</screen> - -&aa-lilo-shortdesc; -&aa-lilo-dep; -&c6-lilo-inst; - -</sect1> diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml index 2b6e70ab7..90ef69e72 100644 --- a/chapter08/chapter08.xml +++ b/chapter08/chapter08.xml @@ -5,6 +5,6 @@ &c8-introduction; &c8-fstab; &c8-kernel; -&c8-lilo; +&c8-grub; </chapter> diff --git a/chapter08/grub.xml b/chapter08/grub.xml new file mode 100644 index 000000000..8585aad12 --- /dev/null +++ b/chapter08/grub.xml @@ -0,0 +1,8 @@ +<sect1 id="ch08-grub"> +<title>Making the LFS system bootable</title> +<?dbhtml filename="grub.html" dir="chapter08"?> + +<para>(To be filled in)</para> + +</sect1> + diff --git a/chapter08/lilo.xml b/chapter08/lilo.xml deleted file mode 100644 index 4c7cb1fa0..000000000 --- a/chapter08/lilo.xml +++ /dev/null @@ -1,48 +0,0 @@ -<sect1 id="ch08-lilo"> -<title>Making the LFS system bootable</title> -<?dbhtml filename="lilo.html" dir="chapter08"?> - -<para>In order to be able to boot the LFS system, we need to update our -bootloader. We're assuming that your host system is using Lilo (since -that's the most commonly used boot loader at the moment).</para> - -<para>We will not be running the lilo program inside chroot. Running lilo -inside chroot can have fatal side-effects which render your MBR useless -and you'd need a boot disk to be able to start any Linux system (either -the host system or the LFS system).</para> - -<para>First we'll exit chroot and copy the lfskernel file to the host -system:</para> - -<para><screen><userinput>logout</userinput> -<userinput>cp $LFS/boot/lfskernel /boot</userinput></screen></para> - -<para>The next step is adding an entry to /etc/lilo.conf so that we can -choose LFS when booting the computer:</para> - -<para><screen><userinput>cat >> /etc/lilo.conf << "EOF"</userinput> -image=/boot/lfskernel - label=lfs - root=<partition> - read-only -<userinput>EOF</userinput></screen></para> - -<para><partition> must be replaced with the LFS -partition's designation.</para> - -<para>Also note that if you are using reiserfs for your root partition, -the line <userinput>read-only</userinput> should be changed to -<userinput>read-write</userinput>.</para> - -<para>Now, update the boot loader by running:</para> - -<para><screen><userinput>/sbin/lilo -v</userinput></screen></para> - -<para>The last step is synchronizing the host system's lilo -configuration files with the LFS system's:</para> - -<para><screen><userinput>cp /etc/lilo.conf $LFS/etc -cp $(grep "image.*=" /etc/lilo.conf | cut -f 2 -d "=") $LFS/boot</userinput></screen></para> - -</sect1> - diff --git a/entities/bin86.ent b/entities/bin86.ent deleted file mode 100644 index 8ac056cab..000000000 --- a/entities/bin86.ent +++ /dev/null @@ -1,20 +0,0 @@ -<!ENTITY c4-bin86 SYSTEM "../chapter04/bin86.xml"> - -<!ENTITY c6-bin86 SYSTEM "../chapter06/bin86.xml"> -<!ENTITY c6-bin86-inst SYSTEM "../chapter06/bin86-inst.xml"> - -<!ENTITY aa-bin86 SYSTEM "../appendixa/bin86.xml"> -<!ENTITY aa-bin86-shortdesc SYSTEM "../appendixa/bin86-shortdesc.xml"> -<!ENTITY aa-bin86-desc SYSTEM "../appendixa/bin86-desc.xml"> -<!ENTITY aa-bin86-dep SYSTEM "../appendixa/bin86-dep.xml"> -<!ENTITY aa-bin86-down SYSTEM "../appendixa/bin86-down.xml"> - -<!ENTITY bin86-version "0.16.3"> -<!ENTITY bin86-depversion "0.16.0"> -<!ENTITY bin86-contversion "0.16.3"> -<!ENTITY bin86-size "142 KB"> -<!ENTITY bin86-dir "bin86-&bin86-version;"> -<!ENTITY bin86-package "bin86-&bin86-version;.tar.bz2"> - -<!ENTITY bin86-compsize "2 MB"> -<!ENTITY bin86-time "0.1 SBU"> diff --git a/entities/grub.ent b/entities/grub.ent new file mode 100644 index 000000000..8248ee8f4 --- /dev/null +++ b/entities/grub.ent @@ -0,0 +1,25 @@ +<!ENTITY c4-grub SYSTEM "../chapter04/grub.xml"> + +<!ENTITY c6-grub SYSTEM "../chapter06/grub.xml"> +<!ENTITY c6-grub-inst SYSTEM "../chapter06/grub-inst.xml"> + +<!ENTITY c8-grub SYSTEM "../chapter08/grub.xml"> + +<!ENTITY aa-grub SYSTEM "../appendixa/grub.xml"> +<!ENTITY aa-grub-shortdesc SYSTEM "../appendixa/grub-shortdesc.xml"> +<!ENTITY aa-grub-desc SYSTEM "../appendixa/grub-desc.xml"> +<!ENTITY aa-grub-dep SYSTEM "../appendixa/grub-dep.xml"> +<!ENTITY aa-grub-down SYSTEM "../appendixa/grub-down.xml"> + +<!ENTITY grub-version "0.93"> +<!ENTITY grub-depversion "0.93"> +<!ENTITY grub-contversion "0.93"> +<!ENTITY grub-size "870 KB"> +<!ENTITY grub-patch-version "0.93-gcc33-1"> +<!ENTITY grub-patch-size "1 KB"> + +<!ENTITY grub-dir "grub-&grub-version;"> +<!ENTITY grub-package "grub-&grub-version;.tar.bz2"> + +<!ENTITY grub-compsize "9 MB"> +<!ENTITY grub-time "? SBU"> diff --git a/entities/lilo.ent b/entities/lilo.ent deleted file mode 100644 index 9e37f95e8..000000000 --- a/entities/lilo.ent +++ /dev/null @@ -1,22 +0,0 @@ -<!ENTITY c4-lilo SYSTEM "../chapter04/lilo.xml"> - -<!ENTITY c6-lilo SYSTEM "../chapter06/lilo.xml"> -<!ENTITY c6-lilo-inst SYSTEM "../chapter06/lilo-inst.xml"> - -<!ENTITY c8-lilo SYSTEM "../chapter08/lilo.xml"> - -<!ENTITY aa-lilo SYSTEM "../appendixa/lilo.xml"> -<!ENTITY aa-lilo-shortdesc SYSTEM "../appendixa/lilo-shortdesc.xml"> -<!ENTITY aa-lilo-desc SYSTEM "../appendixa/lilo-desc.xml"> -<!ENTITY aa-lilo-dep SYSTEM "../appendixa/lilo-dep.xml"> -<!ENTITY aa-lilo-down SYSTEM "../appendixa/lilo-down.xml"> - -<!ENTITY lilo-version "22.2"> -<!ENTITY lilo-depversion "22.1"> -<!ENTITY lilo-contversion "22.2"> -<!ENTITY lilo-size "343 KB"> -<!ENTITY lilo-dir "lilo-&lilo-version;"> -<!ENTITY lilo-package "lilo-&lilo-version;.tar.bz2"> - -<!ENTITY lilo-compsize "3 MB"> -<!ENTITY lilo-time "0.1 SBU"> @@ -40,7 +40,6 @@ <!ENTITY % automake-entities SYSTEM "entities/automake.ent"> <!ENTITY % bash-entities SYSTEM "entities/bash.ent"> <!ENTITY % basic-net-entities SYSTEM "entities/basic-net.ent"> -<!ENTITY % bin86-entities SYSTEM "entities/bin86.ent"> <!ENTITY % binutils-entities SYSTEM "entities/binutils.ent"> <!ENTITY % bison-entities SYSTEM "entities/bison.ent"> <!ENTITY % bootscripts-entities SYSTEM "entities/bootscripts.ent"> @@ -61,6 +60,7 @@ <!ENTITY % glibc-entities SYSTEM "entities/glibc.ent"> <!ENTITY % grep-entities SYSTEM "entities/grep.ent"> <!ENTITY % groff-entities SYSTEM "entities/groff.ent"> +<!ENTITY % grub-entities SYSTEM "entities/grub.ent"> <!ENTITY % gzip-entities SYSTEM "entities/gzip.ent"> <!ENTITY % inetutils-entities SYSTEM "entities/inetutils.ent"> <!ENTITY % kbd-entities SYSTEM "entities/kbd.ent"> @@ -68,7 +68,6 @@ <!ENTITY % less-entities SYSTEM "entities/less.ent"> <!ENTITY % lfs-utils-entities SYSTEM "entities/lfs-utils.ent"> <!ENTITY % libtool-entities SYSTEM "entities/libtool.ent"> -<!ENTITY % lilo-entities SYSTEM "entities/lilo.ent"> <!ENTITY % lockingglibc-entities SYSTEM "entities/lockingglibc.ent"> <!ENTITY % m4-entities SYSTEM "entities/m4.ent"> <!ENTITY % make-entities SYSTEM "entities/make.ent"> @@ -112,7 +111,6 @@ %automake-entities; %bash-entities; %basic-net-entities; -%bin86-entities; %binutils-entities; %bison-entities; %bootscripts-entities; @@ -133,6 +131,7 @@ %glibc-entities; %grep-entities; %groff-entities; +%grub-entities; %gzip-entities; %inetutils-entities; %kbd-entities; @@ -140,7 +139,6 @@ %less-entities; %lfs-utils-entities; %libtool-entities; -%lilo-entities; %lockingglibc-entities; %m4-entities; %make-entities; |