aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--book/part2.xml1
-rw-r--r--chapter06/chapter06.xml2
-rw-r--r--chapter06/netkitbase.xml4
-rw-r--r--chapter06/nettools.xml4
-rw-r--r--chapter07/bootscripts.xml14
-rw-r--r--chapter07/chapter07.xml4
-rw-r--r--chapter07/ethnet-symperm.xml35
-rw-r--r--chapter07/ethnet.xml4
-rw-r--r--chapter07/finalreboot.xml30
-rw-r--r--chapter07/hosts.xml2
-rw-r--r--chapter07/introduction.xml20
-rw-r--r--chapter07/localnet-symperm.xml17
-rw-r--r--chapter07/localnet.xml4
-rw-r--r--chapter07/network.xml2
-rw-r--r--chapter07/symperm.xml15
-rw-r--r--chapter09/theend.xml19
-rw-r--r--index.xml24
17 files changed, 71 insertions, 130 deletions
diff --git a/book/part2.xml b/book/part2.xml
index fbceb343a..c8ebcc95f 100644
--- a/book/part2.xml
+++ b/book/part2.xml
@@ -8,6 +8,5 @@
&chapter7;
&chapter8;
&chapter9;
-&chapter10;
</part>
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 4ad52b9dd..180bd8f49 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -40,6 +40,8 @@
&c6-lilo;
&c6-make;
&c6-modutils;
+&c6-netkitbase;
+&c6-nettools;
&c6-patch;
&c6-procinfo;
&c6-procps;
diff --git a/chapter06/netkitbase.xml b/chapter06/netkitbase.xml
index 74d18e79d..72bc97405 100644
--- a/chapter06/netkitbase.xml
+++ b/chapter06/netkitbase.xml
@@ -1,7 +1,7 @@
-<sect1 id="ch09-netkitbase">
+<sect1 id="ch06-netkitbase">
<title>Installing Netkit-base</title>
-&c9-netkitbase-inst;
+&c6-netkitbase-inst;
&aa-netkitbase-desc;
</sect1>
diff --git a/chapter06/nettools.xml b/chapter06/nettools.xml
index 719b47eae..1aa85a33d 100644
--- a/chapter06/nettools.xml
+++ b/chapter06/nettools.xml
@@ -1,7 +1,7 @@
-<sect1 id="ch09-nettools">
+<sect1 id="ch06-nettools">
<title>Installing Net-tools</title>
-&c9-nettools-inst;
+&c6-nettools-inst;
&aa-nettools-desc;
</sect1>
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index ac33ca2bc..a49c4d609 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -1,12 +1,12 @@
-<sect1 id="ch09-bootscripts">
+<sect1 id="ch07-bootscripts">
<title>Creating network boot scripts</title>
-&c9-bs-localnet;
-&c9-bs-localnet-symperm;
-&c9-bs-hostname;
-&c9-bs-hosts;
-&c9-bs-ethnet;
-&c9-bs-ethnet-symperm;
+&c7-bs-localnet;
+&c7-bs-localnet-symperm;
+&c7-bs-hostname;
+&c7-bs-hosts;
+&c7-bs-ethnet;
+&c7-bs-ethnet-symperm;
</sect1>
diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml
index 0db9dbde2..290739dbf 100644
--- a/chapter07/chapter07.xml
+++ b/chapter07/chapter07.xml
@@ -16,6 +16,10 @@
&c7-setclock;
&c7-sysklogd;
&c7-template;
+&c7-localnet;
+&c7-network;
+&c7-hosts;
+&c7-ethnet;
&c7-symperm;
</chapter>
diff --git a/chapter07/ethnet-symperm.xml b/chapter07/ethnet-symperm.xml
deleted file mode 100644
index 155e33dcb..000000000
--- a/chapter07/ethnet-symperm.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<sect2>
-<title>Setting up permissions and symlink</title>
-
-<para>
-The proper file permissions and the necessary symlinks are set or created by
-running the following commands:
-</para>
-
-<blockquote><literallayout>
- <userinput>cd /etc/init.d &amp;&amp;</userinput>
- <userinput>chmod 754 ethnet &amp;&amp;</userinput>
- <userinput>cd ../rc0.d &amp;&amp;</userinput>
- <userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;
- </userinput>
- <userinput>cd ../rc1.d &amp;&amp;</userinput>
- <userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;
- </userinput>
- <userinput>cd ../rc2.d &amp;&amp;</userinput>
- <userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;
- </userinput>
- <userinput>cd ../rc3.d &amp;&amp;</userinput>
- <userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;
- </userinput>
- <userinput>cd ../rc4.d &amp;&amp;</userinput>
- <userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;
- </userinput>
- <userinput>cd ../rc5.d &amp;&amp;</userinput>
- <userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;
- </userinput>
- <userinput>cd ../rc6.d &amp;&amp;</userinput>
- <userinput>ln -s ../init.d/ethnet K800ethnet</userinput>
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter07/ethnet.xml b/chapter07/ethnet.xml
index f71059a30..c3db3e72d 100644
--- a/chapter07/ethnet.xml
+++ b/chapter07/ethnet.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch09-ethnet">
+<sect1 id="ch07-ethnet">
<title>Creating the /etc/init.d/ethnet script</title>
<para>
@@ -186,7 +186,5 @@ ignored by the ethnet script and thus not brought up.
</sect2>
-&c9-ethnet-symperm;
-
</sect1>
diff --git a/chapter07/finalreboot.xml b/chapter07/finalreboot.xml
deleted file mode 100644
index b6715a101..000000000
--- a/chapter07/finalreboot.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<sect1 id="ch09-finalreboot">
-<title>Final reboot</title>
-
-<para>
-Reboot your system once more. You could run the network scripts by
-hand and then restart sysklogd, but rebooting is a nice way to test if
-everything works as it should. The errors from syslogd and klogd won't
-show up anymore.
-</para>
-
-<para>
-Before you reboot you want to run lilo now. This will install the LFS
-version of Lilo in the MBR instead of your host system's version.
-Update Lilo by running:
-</para>
-
-<blockquote><literallayout>
- <userinput>/sbin/lilo</userinput>
-</literallayout></blockquote>
-
-<para>
-Now, let's reboot:
-</para>
-
-<blockquote><literallayout>
- <userinput>/sbin/reboot</userinput>
-</literallayout></blockquote>
-
-</sect1>
-
diff --git a/chapter07/hosts.xml b/chapter07/hosts.xml
index 490306a81..01684ee6d 100644
--- a/chapter07/hosts.xml
+++ b/chapter07/hosts.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch09-hosts">
+<sect1 id="ch07-hosts">
<title>Creating the /etc/hosts file</title>
<para>
diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml
index e9878ac54..323270849 100644
--- a/chapter07/introduction.xml
+++ b/chapter07/introduction.xml
@@ -1,12 +1,20 @@
-<sect1 id="ch09-introduction">
+<sect1 id="ch07-introduction">
<title>Introduction</title>
<para>
-This chapter will setup basic networking. Although the system might not be
-connected to a network, Linux software uses network functions anyway.
-We'll be installing at least the local loopback device and a network
-card as well if applicable. Also the proper boot scripts will be created
-so that networking will be enabled during boot time.
+This chapter will create the necessary scripts that are run at boot time.
+These scripts perform tasks such as remounting the root file system
+mounted read-only by the kernel into read-write mode, activating the swap
+partition(s), running a check on the root file system to make sure it's
+intact, setting up networking and starting the daemons that the system uses.
+</para>
+
+<para>
+We will be using SysV style init scripts. We have chosen this style because it
+is widely used and we feel confortable with it. If you want to try something
+else, someone has written an LFS-Hint on <ulink
+url="http://archive.linuxfromscratch.org/lfs-hints/BSD-Init.txt">BSD style init
+scripts</ulink>.
</para>
</sect1>
diff --git a/chapter07/localnet-symperm.xml b/chapter07/localnet-symperm.xml
deleted file mode 100644
index ee0e92140..000000000
--- a/chapter07/localnet-symperm.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<sect2>
-<title>Setting up permissions and symlink</title>
-
-<para>
-The proper file permissions and the necessary symlink are set or created by
-running the following commands:
-</para>
-
-<blockquote><literallayout>
- <userinput>cd /etc/init.d &amp;&amp;</userinput>
- <userinput>chmod 754 localnet &amp;&amp;</userinput>
- <userinput>cd ../rcS.d &amp;&amp;</userinput>
- <userinput>ln -s ../init.d/localnet S100localnet</userinput>
-</literallayout></blockquote>
-
-</sect2>
-
diff --git a/chapter07/localnet.xml b/chapter07/localnet.xml
index 8ba6480d2..1aa413b37 100644
--- a/chapter07/localnet.xml
+++ b/chapter07/localnet.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch09-localnet">
+<sect1 id="ch07-localnet">
<title>Creating the /etc/init.d/localnet boot script</title>
<para>
@@ -51,7 +51,5 @@ esac
<userinput>EOF</userinput>
</literallayout>
-&c9-localnet-symperm;
-
</sect1>
diff --git a/chapter07/network.xml b/chapter07/network.xml
index 2ed3f702b..121dc5cb1 100644
--- a/chapter07/network.xml
+++ b/chapter07/network.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch09-network">
+<sect1 id="ch07-network">
<title>Creating the /etc/sysconfig/network file</title>
<para>
diff --git a/chapter07/symperm.xml b/chapter07/symperm.xml
index 3afe64c1b..03c258650 100644
--- a/chapter07/symperm.xml
+++ b/chapter07/symperm.xml
@@ -17,45 +17,48 @@ S20mydaemon, but S020mydaemon. And don't use K2otherdaemon, but
K002otherdaemon.
</para>
-<para>
-Revised rc and rcS scripts are on their way, but we had no time to
-properly test them for this release. They will appear in CVS shortly
-after this version of the book has been released.
-</para>
-
<blockquote><literallayout>
<userinput>cd /etc/init.d &amp;&amp;</userinput>
<userinput>chmod 754 rc rcS functions checkfs halt loadkeys mountfs
reboot &amp;&amp;</userinput>
<userinput>chmod 754 sendsignals setclock sysklogd template
&amp;&amp;</userinput>
+ <userinput>chmod 754 localnet ethnet &amp;&amp;</userinput>
<userinput>cd ../rc0.d &amp;&amp;</userinput>
+ <userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sendsignals S800sendsignals &amp;&amp;
</userinput>
<userinput>ln -s ../init.d/mountfs S900mountfs &amp;&amp;</userinput>
<userinput>ln -s ../init.d/halt S999halt &amp;&amp;</userinput>
<userinput>cd ../rc6.d &amp;&amp;</userinput>
+ <userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sendsignals S800sendsignals &amp;&amp;
</userinput>
<userinput>ln -s ../init.d/mountfs S900mountfs &amp;&amp;</userinput>
<userinput>ln -s ../init.d/reboot S999reboot &amp;&amp;</userinput>
<userinput>cd ../rcS.d &amp;&amp;</userinput>
+ <userinput>ln -s ../init.d/localnet S100localnet &amp;&amp;</userinput>
<userinput>ln -s ../init.d/checkfs S200checkfs &amp;&amp;</userinput>
<userinput>ln -s ../init.d/mountfs S300mountfs &amp;&amp;</userinput>
<userinput>ln -s ../init.d/setclock S400setclock &amp;&amp;</userinput>
<userinput>ln -s ../init.d/loadkeys S500loadkeys &amp;&amp;</userinput>
<userinput>cd ../rc1.d &amp;&amp;</userinput>
+ <userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sysklogd K900sysklogd &amp;&amp;</userinput>
<userinput>cd ../rc2.d &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
+ <userinput>ln -s ../init.d/ethnet K800ethnet &amp;&amp;</userinput>
<userinput>cd ../rc3.d &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
+ <userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
<userinput>cd ../rc4.d &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sysklogd S100sysklogd &amp;&amp;</userinput>
+ <userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
<userinput>cd ../rc5.d &amp;&amp;</userinput>
<userinput>ln -s ../init.d/sysklogd S100sysklogd</userinput>
+ <userinput>ln -s ../init.d/ethnet S200ethnet &amp;&amp;</userinput>
</literallayout></blockquote>
</sect1>
diff --git a/chapter09/theend.xml b/chapter09/theend.xml
index 498a2b176..482216a9b 100644
--- a/chapter09/theend.xml
+++ b/chapter09/theend.xml
@@ -1,4 +1,4 @@
-<sect1 id="ch10-theend">
+<sect1 id="ch09-theend">
<title>The End</title>
<para>
@@ -56,6 +56,23 @@ running:
</literallayout></blockquote>
<para>
+One final thing you may want to do is run lilo now that you are booted
+into LFS. This way you will put the LFS version of LILO in the MBR
+rather than the one that's there right now from your host system.
+Depending on how old your host distribution is, the LFS version may have
+more advanced features you need/could use.
+</para>
+
+<para>
+Either way, run the following to make the lilo version installed on LFS
+active:
+</para>
+
+<blockquote><literallayout>
+ <userinput>/sbin/lilo</userinput>
+</literallayout></blockquote>
+
+<para>
If you are wondering: "Well, where to go now?" you'll be glad to hear that
someone has written an <ulink
url="http://archive.linuxfromscratch.org/lfs-hints/Afterlfs.txt">LFS-Hint</ulink>
diff --git a/index.xml b/index.xml
index 295f6d708..0c2f87e1c 100644
--- a/index.xml
+++ b/index.xml
@@ -295,6 +295,10 @@
<!ENTITY c6-manpages SYSTEM "chapter6/manpages.xml">
<!ENTITY c6-manpages-exp SYSTEM "chapter6/manpages-exp.xml">
<!ENTITY c6-manpages-inst SYSTEM "chapter6/manpages-inst.xml">
+<!ENTITY c6-netkitbase SYSTEM "chapter6/netkitbase.xml">
+<!ENTITY c6-netkitbase-inst SYSTEM "chapter6/netkitbase-inst.xml">
+<!ENTITY c6-nettools SYSTEM "chapter6/nettools.xml">
+<!ENTITY c6-nettools-inst SYSTEM "chapter6/nettools-inst.xml">
<!ENTITY c6-removeoldnss SYSTEM "chapter6/removeoldnss.xml">
<!ENTITY c6-configure SYSTEM "chapter6/configure.xml">
<!ENTITY c6-cf-glibc SYSTEM "chapter6/config-glibc.xml">
@@ -322,6 +326,10 @@
<!ENTITY c7-template SYSTEM "chapter7/template.xml">
<!ENTITY c7-loadkeys SYSTEM "chapter7/loadkeys.xml">
<!ENTITY c7-setclock SYSTEM "chapter7/setclock.xml">
+<!ENTITY c7-localnet SYSTEM "chapter7/localnet.xml">
+<!ENTITY c7-network SYSTEM "chapter7/network.xml">
+<!ENTITY c7-hosts SYSTEM "chapter7/hosts.xml">
+<!ENTITY c7-ethnet SYSTEM "chapter7/ethnet.xml">
<!ENTITY c7-symperm SYSTEM "chapter7/symperm.xml">
<!ENTITY chapter8 SYSTEM "chapter8/chapter8.xml">
@@ -332,21 +340,7 @@
<!ENTITY c8-reboot SYSTEM "chapter8/reboot.xml">
<!ENTITY chapter9 SYSTEM "chapter9/chapter9.xml">
-<!ENTITY c9-introduction SYSTEM "chapter9/introduction.xml">
-<!ENTITY c9-netkitbase SYSTEM "chapter9/netkitbase.xml">
-<!ENTITY c9-netkitbase-inst SYSTEM "chapter9/netkitbase-inst.xml">
-<!ENTITY c9-nettools-inst SYSTEM "chapter9/nettools-inst.xml">
-<!ENTITY c9-nettools SYSTEM "chapter9/nettools.xml">
-<!ENTITY c9-localnet SYSTEM "chapter9/localnet.xml">
-<!ENTITY c9-localnet-symperm SYSTEM "chapter9/localnet-symperm.xml">
-<!ENTITY c9-network SYSTEM "chapter9/network.xml">
-<!ENTITY c9-hosts SYSTEM "chapter9/hosts.xml">
-<!ENTITY c9-ethnet SYSTEM "chapter9/ethnet.xml">
-<!ENTITY c9-ethnet-symperm SYSTEM "chapter9/ethnet-symperm.xml">
-<!ENTITY c9-finalreboot SYSTEM "chapter9/finalreboot.xml">
-
-<!ENTITY chapter10 SYSTEM "chapter10/chapter10.xml">
-<!ENTITY c10-theend SYSTEM "chapter10/theend.xml">
+<!ENTITY c9-theend SYSTEM "chapter9/theend.xml">
<!ENTITY appendixa SYSTEM "appendixa/appendixa.xml">
<!ENTITY aa-introduction SYSTEM "appendixa/introduction.xml">