Allow variables in rc.site to override defaults

git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9602 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689

bootscripts/lfs/lib/services/init-functions

@@ -18,9 +18,6 @@
 #
 ########################################################################
 
-# Set any needed environment variables e.g. HEADLESS
-[ -r /etc/sysconfig/rc.site ]  && . /etc/sysconfig/rc.site
-
 ## Environmental setup
 # Setup default values for environment
 umask 022
@@ -66,7 +63,8 @@ BRACKET="\\033[1;34m"        # Brackets are blue
 BOOTLOG=/run/var/bootlog
 KILLDELAY=3
 
-
+# Set any user specified environment variables e.g. HEADLESS
+[ -r /etc/sysconfig/rc.site ]  && . /etc/sysconfig/rc.site
 
 ################################################################################
 # start_daemon()                                                               #

chapter01/changelog.xml

@@ -37,7 +37,16 @@
 
 -->
     <listitem>
-      <para>2011-09-21</para>
+      <para>2011-09-23</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Allow variables in rc.site to override defaults.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
+      <para>2011-09-22</para>
       <itemizedlist>
         <listitem>
           <para>[bdubbs] - Updates to lfs-bootscripts console script.</para>

general.ent

@@ -1,5 +1,5 @@
-<!ENTITY version "SVN-20110922">
-<!ENTITY releasedate "Sep 22, 2011">
+<!ENTITY version "SVN-20110923">
+<!ENTITY releasedate "Sep 23, 2011">
 <!ENTITY copyrightdate "1999-2011"><!-- jhalfs needs a literal dash, not &ndash; -->
 <!ENTITY milestone "7.0">
 <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" -->

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 "20110922">                 <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20110923">                 <!-- 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 -->