gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-22 04:05:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow variables in rc.site to override defaults

Browse Source 
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9602 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
This commit is contained in:
Bruce Dubbs 2011-09-23 17:06:43 +00:00
parent 620c6d09e7
commit 240ff150c6
4 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootscripts/lfs/lib/services/init-functions
View File

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

11
chapter01/changelog.xml
View File

@ -37,7 +37,16 @@
--> -->
<listitem> <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> <itemizedlist>
<listitem> <listitem>
<para>[bdubbs] - Updates to lfs-bootscripts console script.</para> <para>[bdubbs] - Updates to lfs-bootscripts console script.</para>

4
general.ent
View File

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

2
packages.ent
View File

@ -298,7 +298,7 @@
<!ENTITY less-ch6-du "3.5 MB"> <!ENTITY less-ch6-du "3.5 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU"> <!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-size "BOOTSCRIPTS-SIZE KB"> <!-- Updated in Makefile -->
<!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2"> <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.bz2">
<!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile --> <!ENTITY lfs-bootscripts-md5 "BOOTSCRIPTS-MD5SUM"> <!-- Updated in Makefile -->