aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Nichilson <dnicholson@linuxfromscratch.org>2007-07-30 21:45:53 +0000
committerDan Nichilson <dnicholson@linuxfromscratch.org>2007-07-30 21:45:53 +0000
commit31a45f4c5a1d98ca8e53539a685519f71565e2d8 (patch)
tree1dc35a63ab6de14f0380dfa021fe36fa7bc89f3d
parent87184605cb5885d961bcc07fee91bd4a9b7e79a3 (diff)
Merge r8256 from trunk
git-svn-id: http://svn.linuxfromscratch.org/LFS/branches/6.3/BOOK@8257 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--chapter01/changelog.xml11
-rw-r--r--chapter07/bootscripts.xml15
-rw-r--r--chapter07/console.xml5
-rw-r--r--packages.ent4
4 files changed, 31 insertions, 4 deletions
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 2d2f5e1d9..9d65fba41 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -38,6 +38,17 @@
<listitem>
+ <para>2007-07-30</para>
+ <itemizedlist>
+ <listitem>
+ <para>[dnicholson] - Updated LFS-Bootscripts to 20070730 and added
+ the description for the new <command>consolelog</command>
+ script.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>2007-07-26</para>
<itemizedlist>
<listitem>
diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml
index 9c3d93a8c..9cc95dd34 100644
--- a/chapter07/bootscripts.xml
+++ b/chapter07/bootscripts.xml
@@ -48,8 +48,8 @@
<segtitle>Installed scripts</segtitle>
<seglistitem>
- <seg>checkfs, cleanfs, console, functions, halt, ifdown, ifup,
- localnet, modules, mountfs, mountkernfs, network, rc, reboot,
+ <seg>checkfs, cleanfs, console, consolelog, functions, halt, ifdown,
+ ifup, localnet, modules, mountfs, mountkernfs, network, rc, reboot,
sendsignals, setclock, static, swap, sysctl, sysklogd, template,
udev, and udev_retry</seg>
</seglistitem>
@@ -97,6 +97,17 @@
</listitem>
</varlistentry>
+ <varlistentry id="consolelog-bootscripts">
+ <term><command>consolelog</command></term>
+ <listitem>
+ <para>Sets the kernel log level to control messages reaching the
+ console.</para>
+ <indexterm zone="ch-scripts-bootscripts consolelog-bootscripts">
+ <primary sortas="d-consolelog">consolelog</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
+
<varlistentry id="functions-bootscripts">
<term><command>functions</command></term>
<listitem>
diff --git a/chapter07/console.xml b/chapter07/console.xml
index 8402551f3..5bacc045d 100644
--- a/chapter07/console.xml
+++ b/chapter07/console.xml
@@ -15,6 +15,11 @@
<secondary>configuring</secondary>
</indexterm>
+ <indexterm zone="ch-scripts-console">
+ <primary sortas="d-consolelog">consolelog</primary>
+ <secondary>configuring</secondary>
+ </indexterm>
+
<para>This section discusses how to configure the <command>console</command>
and <command>consolelog</command> bootscripts that set up the keyboard map,
console font and console kernel log level. If non-ASCII characters (e.g.,
diff --git a/packages.ent b/packages.ent
index 6f0df6600..10b0ba358 100644
--- a/packages.ent
+++ b/packages.ent
@@ -281,10 +281,10 @@
<!ENTITY less-ch6-du "2.8 MB">
<!ENTITY less-ch6-sbu "0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20070420">
+<!ENTITY lfs-bootscripts-version "20070730">
<!ENTITY lfs-bootscripts-size "39 KB">
<!ENTITY lfs-bootscripts-url "http://www.linuxfromscratch.org/lfs/downloads/development/lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
-<!ENTITY lfs-bootscripts-md5 "e27ed8fc5f4438020b79c4fe6962a2ab">
+<!ENTITY lfs-bootscripts-md5 "d50c72aa2f45c646f384a1ffeb20fafe">
<!ENTITY lfs-bootscripts-home " ">
<!ENTITY lfs-bootscripts-ch7-du "0.4 MB">
<!ENTITY lfs-bootscripts-ch7-sbu "less than 0.1 SBU">