diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2011-09-23 17:06:43 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2011-09-23 17:06:43 +0000 |
| commit | 240ff150c6a2700866b7cf9505f5af933f3df3e3 (patch) | |
| tree | 76d48418e0c4b6e2fc21bdb8e3b8ec694c4f5b88 | |
| parent | 620c6d09e7d7154c1b6380adbdb00847175a2727 (diff) | |
Allow variables in rc.site to override defaults
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9602 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | bootscripts/lfs/lib/services/init-functions | 6 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 11 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 2 |
4 files changed, 15 insertions, 8 deletions
diff --git a/bootscripts/lfs/lib/services/init-functions b/bootscripts/lfs/lib/services/init-functions index 02d0c876d..93931dca9 100644 --- a/bootscripts/lfs/lib/services/init-functions +++ b/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() # diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 00b00df8d..3e0ddbc08 100644 --- a/chapter01/changelog.xml +++ b/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> diff --git a/general.ent b/general.ent index e6e3536ce..cfc97e700 100644 --- a/general.ent +++ b/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 – --> <!ENTITY milestone "7.0"> <!ENTITY generic-version "development"> <!-- Use "development", "testing", or "x.y[-pre{x}]" --> diff --git a/packages.ent b/packages.ent index e7498476d..a3539db07 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 "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 --> |