aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBruce Dubbs <bdubbs@linuxfromscratch.org>2012-02-10 05:11:28 +0000
committerBruce Dubbs <bdubbs@linuxfromscratch.org>2012-02-10 05:11:28 +0000
commit6553bff0df545f505c036a430f94008258747a90 (patch)
tree690914fe3792fd17ff1cfe95cfcb10847acc84b7
parentfe3809eb7a28721c9d54a04bc2cd2f4642c475fe (diff)
Fix typo and clarify error check in ifup script
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@9739 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
-rwxr-xr-xbootscripts/lfs/sbin/ifup8
-rw-r--r--packages.ent2
2 files changed, 5 insertions, 5 deletions
diff --git a/bootscripts/lfs/sbin/ifup b/bootscripts/lfs/sbin/ifup
index 2e3d88e49..744b4cea2 100755
--- a/bootscripts/lfs/sbin/ifup
+++ b/bootscripts/lfs/sbin/ifup
@@ -76,11 +76,11 @@ if [ "${IN_BOOT}" = "1" -a "${ONBOOT}" != "yes" ]; then
exit 0
fi
-for S in ${SERVICES}; do
- if [ ! -n "${S}" -o ! -x "/lib/services/${S}" ]; then
+for S in ${SERVICE}; do
+ if [ ! -x "/lib/services/${S}" ]; then
MSG="\nUnable to process ${file}. Either "
- MSG="${MSG}the SERVICE variable was not set "
- MSG="${MSG}or the specified service cannot be executed."
+ MSG="${MSG}the SERVICE '${S} was not present "
+ MSG="${MSG}or cannot be executed."
log_failure_msg "$MSG"
exit 1
fi
diff --git a/packages.ent b/packages.ent
index beeee3711..aeb2290cf 100644
--- a/packages.ent
+++ b/packages.ent
@@ -305,7 +305,7 @@
<!ENTITY less-ch6-du "3.5 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
-<!ENTITY lfs-bootscripts-version "20120204"> <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20120209"> <!-- 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 -->