aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chapter06/bootscripts.xml42
-rw-r--r--chapter06/chapter06.xml1
-rw-r--r--chapter07/bootscripts.xml33
-rw-r--r--chapter07/chapter07.xml24
-rw-r--r--entities/bootscripts.ent10
5 files changed, 61 insertions, 49 deletions
diff --git a/chapter06/bootscripts.xml b/chapter06/bootscripts.xml
deleted file mode 100644
index 159470d1f..000000000
--- a/chapter06/bootscripts.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<sect1 id="ch-system-lfs-bootscripts" xreflabel="Bootscripts">
-<title>Installing LFS-Bootscripts-&bootscripts-version;</title>
-<?dbhtml filename="bootscripts.html" dir="chapter06"?>
-
-<para>The LFS-Bootscripts package contains a set of bootscripts.</para>
-
-<screen>&buildtime; &bootscripts-time;
-&diskspace; &bootscripts-compsize;</screen>
-
-&aa-bootscripts-down;
-&aa-bootscripts-dep;
-
-<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-
-<sect2>
-<title>Installation of LFS-Bootscripts</title>
-
-<para>We will be using SysV style init scripts. We have chosen this style
-because it is widely used and we feel comfortable with it. If you would prefer
-to try something else, Marc Heerdink has written a hint about BSD style init
-scripts, to be found at <ulink url="&hints-root;bsd-init.txt"/>. And if you'd
-like something more radical, search the LFS mailing lists for depinit.</para>
-
-<para>If you decide to use BSD style, or some other style scripts, you can
-skip the next chapter when you arrive at it and move on to
-<xref linkend="chapter-mixture"/>.</para>
-
-<para>Install the boot scripts:</para>
-
-<screen><userinput>cp -a rc.d sysconfig /etc</userinput></screen>
-
-<para>Give <emphasis>root</emphasis> ownership of the scripts:</para>
-
-<screen><userinput>chown -R root:root /etc/rc.d /etc/sysconfig</userinput></screen>
-
-</sect2>
-
-&aa-bootscripts-shortdesc;
-&aa-bootscripts-desc;
-
-</sect1>
-
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml
index 070284803..be329ce99 100644
--- a/chapter06/chapter06.xml
+++ b/chapter06/chapter06.xml
@@ -521,7 +521,6 @@ just yet. There is still some use for it towards the end of the book.</para>
</sect1>
-&c6-bootscripts;
&c6-aboutdebug;
</chapter>
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
new file mode 100644
index 000000000..dc90e2e68
--- /dev/null
+++ b/chapter07/bootscripts.xml
@@ -0,0 +1,33 @@
+<sect1 id="ch-system-lfs-bootscripts" xreflabel="Bootscripts">
+<title>Installing LFS-Bootscripts-&bootscripts-version;</title>
+<?dbhtml filename="bootscripts.html" dir="chapter07"?>
+
+<para>The LFS-Bootscripts package contains a set of bootscripts.</para>
+
+<screen>&buildtime; &bootscripts-time;
+&diskspace; &bootscripts-compsize;</screen>
+
+&bootscripts-down;
+&bootscripts-dep;
+
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
+<sect2>
+<title>Installation of LFS-Bootscripts</title>
+
+<para>Install the boot scripts simply by copying them to their
+destination:</para>
+
+<screen><userinput>cp -a rc.d sysconfig /etc</userinput></screen>
+
+<para>Make sure <emphasis>root</emphasis> is owner of the scripts:</para>
+
+<screen><userinput>chown -R root:root /etc/rc.d /etc/sysconfig</userinput></screen>
+
+</sect2>
+
+&bootscripts-shortdesc;
+&bootscripts-desc;
+
+</sect1>
+
diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml
index 7e07e8ecd..9dc8bc3ac 100644
--- a/chapter07/chapter07.xml
+++ b/chapter07/chapter07.xml
@@ -2,7 +2,29 @@
<title>Setting up system boot scripts</title>
<?dbhtml filename="chapter07.html" dir="chapter07"?>
-&c7-introduction;
+
+<sect1 id="ch-scripts-introduction">
+<title>Introduction</title>
+<?dbhtml filename="introduction.html" dir="chapter07"?>
+
+<para>In this chapter we will install the bootscripts and set them up
+properly. Most of these scripts will work without needing to modify them, but
+a few require additional configuration files, since they deal with hardware
+dependent information.</para>
+
+<para>We have chosen to use System-V style init scripts simply because they
+are widely used and we feel comfortable with them. If you would prefer to try
+something else: Marc Heerdink has written a hint about BSD style init scripts,
+to be found at <ulink url="&hints-root;bsd-init.txt"/>. And if you'd like
+something more radical, search the LFS mailing lists for "depinit".</para>
+
+<para>If you decide to use some other style of init scripts, you can skip this
+chapter and move on to <xref linkend="chapter-mixture"/>.</para>
+
+</sect1>
+
+
+&bootscripts;
&c7-usage;
&c7-setclock;
&c7-loadkeys;
diff --git a/entities/bootscripts.ent b/entities/bootscripts.ent
index 03b0a2239..54aeee96d 100644
--- a/entities/bootscripts.ent
+++ b/entities/bootscripts.ent
@@ -1,9 +1,9 @@
-<!ENTITY c6-bootscripts SYSTEM "../chapter06/bootscripts.xml">
+<!ENTITY bootscripts SYSTEM "../chapter07/bootscripts.xml">
-<!ENTITY aa-bootscripts-shortdesc SYSTEM "../appendixa/bootscripts-shortdesc.xml">
-<!ENTITY aa-bootscripts-desc SYSTEM "../appendixa/bootscripts-desc.xml">
-<!ENTITY aa-bootscripts-dep SYSTEM "../appendixa/bootscripts-dep.xml">
-<!ENTITY aa-bootscripts-down SYSTEM "../appendixa/bootscripts-down.xml">
+<!ENTITY bootscripts-shortdesc SYSTEM "../appendixa/bootscripts-shortdesc.xml">
+<!ENTITY bootscripts-desc SYSTEM "../appendixa/bootscripts-desc.xml">
+<!ENTITY bootscripts-dep SYSTEM "../appendixa/bootscripts-dep.xml">
+<!ENTITY bootscripts-down SYSTEM "../appendixa/bootscripts-down.xml">
<!ENTITY bootscripts-version "1.12">
<!ENTITY bootscripts-depversion "1.12">