aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2011-11-08 19:11:01 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2011-11-08 19:11:01 +0000
commit916c906b11e3a6ad31d1ffc0d77369b2058b1a86 (patch)
treed850a37d195d0a38afabb174b80085c23b492853
parent5094344aedd64325c0243b95d9ee4136aa737252 (diff)
Text correction in bootscripts description.
Remove erroneous sourcing line in bootscript 'functions' file used for backward BLFS compatibility. git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9659 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rw-r--r--bootscripts/lfs/init.d/functions3
-rw-r--r--chapter01/changelog.xml13
-rw-r--r--chapter07/usage.xml2
-rw-r--r--general.ent4
-rw-r--r--packages.ent2
5 files changed, 17 insertions, 7 deletions
diff --git a/bootscripts/lfs/init.d/functions b/bootscripts/lfs/init.d/functions
index 242e78720..58165a3bf 100644
--- a/bootscripts/lfs/init.d/functions
+++ b/bootscripts/lfs/init.d/functions
@@ -16,9 +16,6 @@
#
########################################################################
-# Set any needed environment variables e.g. HEADLESS
-. /lib/lsb/init_params
-
## Environmental setup
# Setup default values for environment
umask 022
diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml
index 4626a745c..bef80f831 100644
--- a/chapter01/changelog.xml
+++ b/chapter01/changelog.xml
@@ -40,6 +40,19 @@
<para>2011-10-29</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Text correction in bootscripts description.</para>
+ </listitem>
+ <listitem>
+ <para>[bdubbs] - Remove erroneous sourcing line in bootscript
+ functions used for backward BLFS compatibility.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
+ <para>2011-10-29</para>
+ <itemizedlist>
+ <listitem>
<para>[matthew] - Upgrade to GCC-4.6.2. Fixes
<ulink url="&lfs-ticket-root;2951">#2951</ulink>.</para>
</listitem>
diff --git a/chapter07/usage.xml b/chapter07/usage.xml
index c2e7290be..e729637b8 100644
--- a/chapter07/usage.xml
+++ b/chapter07/usage.xml
@@ -95,7 +95,7 @@ EOF</userinput></screen>
<para>As a convenience, the <command>rc</command> script reads a library of
functions in <filename class="directory">/lib/lsb/init-functions</filename>.
This library also reads an optional configuration file,
- <filename>/etc/sysconfig/init_params</filename>. Any of the system
+ <filename>/etc/sysconfig/rc.site</filename>. Any of the system
configuration file parameters described in subsequent sections can be
alternatively placed in this file allowing consolidation of all system
parameters in this one file.</para>
diff --git a/general.ent b/general.ent
index 5b58263c1..a12adfbcf 100644
--- a/general.ent
+++ b/general.ent
@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20111029">
-<!ENTITY releasedate "Oct 29, 2011">
+<!ENTITY version "SVN-20111108">
+<!ENTITY releasedate "Nov 8, 2011">
<!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
<!ENTITY milestone "7.1">
<!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->
diff --git a/packages.ent b/packages.ent
index 0c767374d..1eeabeed6 100644
--- a/packages.ent
+++ b/packages.ent
@@ -298,7 +298,7 @@
<!ENTITY less-ch6-du "3.5 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20111017"> <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20111108"> <!-- Scripts depend on this format -->
<!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile -->
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile -->