initscripts: populate-volatile: improve config file parsing

This improves the config file parsing to permit blank lines and
comments following an entry or preceeded by whitespace.

Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>

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 ce4622a5e555006e046023cb984f5966dfeb0b47..91514bac86fa3d1606348be85efc8bc0ef11941a 100755 (executable)
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -150,9 +150,9 @@ apply_cfgfile() {
                return 1
        }
 
-       cat ${CFGFILE} | grep -v "^#" | \
-               while read LINE; do
-               eval `echo "$LINE" | sed -n "s/\(.*\)\ \(.*\) \(.*\)\ \(.*\)\ \(.*\)\ \(.*\)/TTYPE=\1 ; TUSER=\2; TGROUP=\3; TMODE=\4; TNAME=\5 TLTARGET=\6/p"`
+       cat ${CFGFILE} | sed 's/#.*//' | \
+       while read TTYPE TUSER TGROUP TMODE TNAME TLTARGET; do
+               test -z "${TLTARGET}" && continue
                TNAME=${ROOT_DIR}${TNAME}
                [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
 

diff --git a/meta/recipes-core/initscripts/initscripts-1.0/volatiles b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
index 297245d0e40efb5a2f00d825098fb25c6a435c0c..bc17c4553da243ccfb87fd12e7f524b051cf4a0a 100644 (file)
--- a/meta/recipes-core/initscripts/initscripts-1.0/volatiles
+++ b/meta/recipes-core/initscripts/initscripts-1.0/volatiles
@@ -1,11 +1,13 @@
 # This configuration file lists filesystem objects that should get verified
 # during startup and be created if missing.
 #
-# Every line must either be a comment starting with #
-# or a definition of format:
+# Entries have the following format:
 # <type> <owner> <group> <mode> <path> <linksource>
 # where the items are separated by whitespace !
 #
+# The # character introduces a comment lasting until end of line.
+# Blank lines are ignored.
+#
 # <type> : d|f|l : (d)irectory|(f)ile|(l)ink
 #
 # A linking example: