This avoids triple slashes in the generated /etc/volatile.cache to
reduce disk usage and in the output when verbose mode is enabled.

As all the paths for volatiles start with a slash, we can change
TNAME=${ROOT_DIR}/${TNAME} to TNAME=${ROOT_DIR}${TNAME}. To avoid
a double slash when ROOT_DIR is /, we strip the extra slash from
ROOT_DIR.

Signed-off-by: Jonathan Liu <net...@gmail.com>
---
 .../initscripts/initscripts-1.0/populate-volatile.sh         | 12 ++++++------
 1 file changed, 6 insertions(+), 6 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 ab09231..430d083 100755
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -10,11 +10,11 @@
 
 # Get ROOT_DIR
 DIRNAME=`dirname $0`
-ROOT_DIR=`echo $DIRNAME | sed -ne 's:etc/.*::p'`
+ROOT_DIR=`echo $DIRNAME | sed -ne 's:/etc/.*::p'`
 
 [ -e ${ROOT_DIR}/etc/default/rcS ] && . ${ROOT_DIR}/etc/default/rcS
 # When running populate-volatile.sh at rootfs time, disable cache.
-[ "$ROOT_DIR" != "/" ] && VOLATILE_ENABLE_CACHE=no
+[ -n "$ROOT_DIR" ] && VOLATILE_ENABLE_CACHE=no
 # If rootfs is read-only, disable cache.
 [ "$ROOTFS_READ_ONLY" = "yes" ] && VOLATILE_ENABLE_CACHE=no
 
@@ -35,7 +35,7 @@ create_file() {
        [ -e "$1" ] && {
                [ "${VERBOSE}" != "no" ] && echo "Target already exists. 
Skipping."
        } || {
-               if [ "$ROOT_DIR" = "/" ]; then
+               if [ -z "$ROOT_DIR" ]; then
                        eval $EXEC &
                else
                        # Creating some files at rootfs time may fail and 
should fail,
@@ -57,7 +57,7 @@ mk_dir() {
        [ -e "$1" ] && {
                [ "${VERBOSE}" != "no" ] && echo "Target already exists. 
Skipping."
        } || {
-               if [ "$ROOT_DIR" = "/" ]; then
+               if [ -z "$ROOT_DIR" ]; then
                        eval $EXEC
                else
                        # For the same reason with create_file(), failures 
should
@@ -82,7 +82,7 @@ link_file() {
 
        test "$VOLATILE_ENABLE_CACHE" = yes && echo "   $EXEC" >> 
/etc/volatile.cache.build
 
-       if [ "$ROOT_DIR" = "/" ]; then
+       if [ -z "$ROOT_DIR" ]; then
                eval $EXEC &
        else
                # For the same reason with create_file(), failures should
@@ -150,7 +150,7 @@ apply_cfgfile() {
        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"`
-               TNAME=${ROOT_DIR}/${TNAME}
+               TNAME=${ROOT_DIR}${TNAME}
                [ "${VERBOSE}" != "no" ] && echo "Checking for -${TNAME}-."
 
                [ "${TTYPE}" = "l" ] && {
-- 
1.8.2.3


_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Reply via email to