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

login
register
mail settings
Submitter Ming Liu
Date Sept. 10, 2013, 7:53 a.m.
Message ID <1378799604-22201-1-git-send-email-ming.liu@windriver.com>
Download mbox | patch
Permalink /patch/57737/
State Accepted
Commit 879ad0532c503991d90e865567f7ea78d57da3a7
Headers show

Comments

Ming Liu - Sept. 10, 2013, 7:53 a.m.
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@windriver.com>
---
 .../initscripts-1.0/populate-volatile.sh           |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

Patch

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`"