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 @@ --> - 2011-09-21 + 2011-09-23 + + + [bdubbs] - Allow variables in rc.site to override defaults. + + + + + + 2011-09-22 [bdubbs] - Updates to lfs-bootscripts console script. diff --git a/general.ent b/general.ent index e6e3536ce..cfc97e700 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ - - + + diff --git a/packages.ent b/packages.ent index e7498476d..a3539db07 100644 --- a/packages.ent +++ b/packages.ent @@ -298,7 +298,7 @@ - +