[oe-commits] Ming Liu : initscripts: filter out empty lines from volatiles in check_requirements()

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 71ab9ee58b0ba5e3f5cbf403d1b8fb79fc7f5ed1
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=71ab9ee58b0ba5e3f5cbf403d1b8fb79fc7f5ed1

Author: Ming Liu <ming.liu at windriver.com>
Date:   Tue Sep 10 15:53:24 2013 +0800

initscripts: filter out empty lines from volatiles in check_requirements()

So far the rules of check_requirements() is too strict to lead mismatch
when empty lines exist in volatiles.

Signed-off-by: Ming Liu <ming.liu at windriver.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../initscripts-1.0/populate-volatile.sh           |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
index 915b7d0..6ffe1f2 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -107,7 +107,7 @@ check_requirements() {
 	TMP_COMBINED="${TMPROOT}/tmpcombined.$$"
 
 	cat ${ROOT_DIR}/etc/passwd | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
-	cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 2 > "${TMP_INTERMED}"
+	cat ${CFGFILE} | grep -v "^#" | cut -s -d " " -f 2 > "${TMP_INTERMED}"
 	cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
 	NR_DEFINED_USERS="`cat "${TMP_DEFINED}" | wc -l`"
 	NR_COMBINED_USERS="`cat "${TMP_COMBINED}" | wc -l`"
@@ -121,7 +121,7 @@ check_requirements() {
 
 
 	cat ${ROOT_DIR}/etc/group | sed 's@\(^:\)*:.*@\1@' | sort | uniq > "${TMP_DEFINED}"
-	cat ${CFGFILE} | grep -v "^#" | cut -d " " -f 3 > "${TMP_INTERMED}"
+	cat ${CFGFILE} | grep -v "^#" | cut -s -d " " -f 3 > "${TMP_INTERMED}"
 	cat "${TMP_DEFINED}" "${TMP_INTERMED}" | sort | uniq > "${TMP_COMBINED}"
 
 	NR_DEFINED_GROUPS="`cat "${TMP_DEFINED}" | wc -l`"