aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--appendixa/sysvinit-dep.xml2
-rw-r--r--appendixa/sysvinit-desc.xml12
-rw-r--r--appendixa/sysvinit-shortdesc.xml17
-rw-r--r--appendixa/sysvinit.xml1
-rw-r--r--chapter06/sysvinit-inst.xml17
-rw-r--r--chapter06/sysvinit.xml4
-rw-r--r--entities/sysvinit.ent1
7 files changed, 38 insertions, 16 deletions
diff --git a/appendixa/sysvinit-dep.xml b/appendixa/sysvinit-dep.xml
index 38f706f99..23f034d1e 100644
--- a/appendixa/sysvinit-dep.xml
+++ b/appendixa/sysvinit-dep.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Sysvinit Installation Dependencies</title>
diff --git a/appendixa/sysvinit-desc.xml b/appendixa/sysvinit-desc.xml
index 77ab50913..532cd102f 100644
--- a/appendixa/sysvinit-desc.xml
+++ b/appendixa/sysvinit-desc.xml
@@ -1,14 +1,10 @@
-<sect2><title>Contents of Sysvinit</title>
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
-<para>Last checked against version &sysvinit-contversion;.</para>
+<sect2><title>Descriptions</title>
-<sect3><title>Program Files</title>
-<para>halt, init, killall5, last, lastb (link to last), mesg, pidof
-(link to killall5), poweroff (link to halt), reboot (link to halt),
-runlevel, shutdown, sulogin, telinit (link to init), utmpdump and
-wall</para></sect3>
+<para>Last checked against version &sysvinit-contversion;.</para>
-<sect3><title>Descriptions</title>
+<sect3><title>Program file descriptions</title>
<sect4><title>halt</title>
<para>halt notes, in the file /var/log/wtmp, that the system is being
diff --git a/appendixa/sysvinit-shortdesc.xml b/appendixa/sysvinit-shortdesc.xml
new file mode 100644
index 000000000..a59e5042b
--- /dev/null
+++ b/appendixa/sysvinit-shortdesc.xml
@@ -0,0 +1,17 @@
+<sect2><title>Contents of Sysvinit</title>
+
+<para>Last checked against version &sysvinit-contversion;.</para>
+
+<para>The Sysvinit package contains programs to control the
+startup, running and shutdown of all other programs.</para>
+
+<para>Sysvinit installs the following:</para>
+
+<sect3><title>Program Files</title>
+<para>halt, init, killall5, last, lastb (link to last), mesg, pidof
+(link to killall5), poweroff (link to halt), reboot (link to halt),
+runlevel, shutdown, sulogin, telinit (link to init), utmpdump and
+wall</para></sect3>
+
+</sect2>
+
diff --git a/appendixa/sysvinit.xml b/appendixa/sysvinit.xml
index 006b6d750..07afe660c 100644
--- a/appendixa/sysvinit.xml
+++ b/appendixa/sysvinit.xml
@@ -3,6 +3,7 @@
<?dbhtml filename="sysvinit.html" dir="appendixa"?>
&aa-sysvinit-down;
+&aa-sysvinit-shortdesc;
&aa-sysvinit-desc;
&aa-sysvinit-dep;
diff --git a/chapter06/sysvinit-inst.xml b/chapter06/sysvinit-inst.xml
index ca0f81f1b..f617a5d9c 100644
--- a/chapter06/sysvinit-inst.xml
+++ b/chapter06/sysvinit-inst.xml
@@ -1,3 +1,5 @@
+<sect2><title>&nbsp;</title><para>&nbsp;</para></sect2>
+
<sect2>
<title>Installation of Sysvinit</title>
@@ -6,18 +8,21 @@ init sends the TERM and KILL signals to the processes which it started.
init prints "Sending processes the TERM signal" to the screen. This seems
to imply that init is sending these signals to all the currently running
processes. To avoid this confusion, the init.c file can be modified, so
-that the sentence reads "Sending processes started by init the TERM signal",
-by running the following commands. If you don't want to change it,
-skip it.</para>
+that the sentence reads "Sending processes started by init the TERM signal".</para>
+
+<para>Edit the halt message:</para>
<para><screen><userinput>cp src/init.c{,.backup} &amp;&amp;
sed 's/Sending processes/Sending processes started by init/g' \
&nbsp;&nbsp;&nbsp;&nbsp;src/init.c.backup &gt; src/init.c</userinput></screen></para>
-<para>Install Sysvinit by running the following commands:</para>
+<para>Compile Sysvinit:</para>
+
+<para><screen><userinput>make -C src</userinput></screen></para>
+
+<para>Finish installing the package:</para>
-<para><screen><userinput>make -C src &amp;&amp;
-make -C src install</userinput></screen></para>
+<para><screen><userinput>make -C src install</userinput></screen></para>
</sect2>
diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml
index f2eea3155..4d96ca325 100644
--- a/chapter06/sysvinit.xml
+++ b/chapter06/sysvinit.xml
@@ -5,8 +5,8 @@
<screen>Estimated build time: &sysvinit-time;
Estimated required disk space: &sysvinit-compsize;</screen>
-&c6-sysvinit-inst;
-&aa-sysvinit-desc;
+&aa-sysvinit-shortdesc;
&aa-sysvinit-dep;
+&c6-sysvinit-inst;
</sect1>
diff --git a/entities/sysvinit.ent b/entities/sysvinit.ent
index 752791f61..a68c09919 100644
--- a/entities/sysvinit.ent
+++ b/entities/sysvinit.ent
@@ -8,6 +8,7 @@
<!ENTITY aa-sysvinit-desc SYSTEM "../appendixa/sysvinit-desc.xml">
<!ENTITY aa-sysvinit-dep SYSTEM "../appendixa/sysvinit-dep.xml">
<!ENTITY aa-sysvinit-down SYSTEM "../appendixa/sysvinit-down.xml">
+<!ENTITY aa-sysvinit-shortdesc SYSTEM "../appendixa/sysvinit-shortdesc.xml">
<!ENTITY sysvinit-version "2.84">
<!ENTITY sysvinit-depversion "2.84">