diff options
| author | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2011-09-26 16:40:50 +0000 |
|---|---|---|
| committer | Bruce Dubbs <bdubbs@linuxfromscratch.org> | 2011-09-26 16:40:50 +0000 |
| commit | d8efcaddcc8033ed839e7055dfcd788a106bc3b9 (patch) | |
| tree | 3331694a7ec7a2f9fba32743da4dd4092b115fcf | |
| parent | 240ff150c6a2700866b7cf9505f5af933f3df3e3 (diff) | |
Correct syntax in modules boot script
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9603 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | bootscripts/lfs/init.d/modules | 4 | ||||
| -rw-r--r-- | chapter01/changelog.xml | 9 | ||||
| -rw-r--r-- | general.ent | 4 | ||||
| -rw-r--r-- | packages.ent | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/bootscripts/lfs/init.d/modules b/bootscripts/lfs/init.d/modules index f1c226c7f..45c9220df 100644 --- a/bootscripts/lfs/init.d/modules +++ b/bootscripts/lfs/init.d/modules @@ -34,8 +34,8 @@ case "${1}" in start) # Exit if there's no modules file or there are no # valid entries - [ -r /etc/sysconfig/modules ] || exit 0 - [ $(egrep -qv '^($|#)' /etc/sysconfig/modules) ] || exit 0 + [ -r /etc/sysconfig/modules ] || exit 0 + $(egrep -qv '^($|#)' /etc/sysconfig/modules) || exit 0 log_info_msg "Loading modules:" diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index 3e0ddbc08..a050a55cb 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -37,6 +37,15 @@ --> <listitem> + <para>2011-09-26</para> + <itemizedlist> + <listitem> + <para>[bdubbs] - Correct syntax in modules boot script.</para> + </listitem> + </itemizedlist> + </listitem> + + <listitem> <para>2011-09-23</para> <itemizedlist> <listitem> diff --git a/general.ent b/general.ent index cfc97e700..a8653a3c3 100644 --- a/general.ent +++ b/general.ent @@ -1,5 +1,5 @@ -<!ENTITY version "SVN-20110923"> -<!ENTITY releasedate "Sep 23, 2011"> +<!ENTITY version "SVN-20110926"> +<!ENTITY releasedate "Sep 26, 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 a3539db07..b624fe3a3 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 "20110923"> <!-- Scripts depend on this format --> +<!ENTITY lfs-bootscripts-version "20110926"> <!-- 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 --> |