initscripts: don't bg mk_dirs in populate-volatile

If a directory needs to be created to create something else in volatiles,
there's no guarantees on ordering due to the backgrounding. We can't guarantee
with certainty that the create directory commands are complete before the
later ones run. This ensures that we wait for directory creations to complete
before we proceed.

Chris Hallinan hit an actual failure due to this back in March of last year.

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.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 4a99aff6a4185ed81ba5d25eabecaf909c570db3..d2175d7a7cc715c29130d06ce280c479fcbcad36 100755 (executable)
--- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
+++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh
@@ -42,7 +42,7 @@ mk_dir() {
        [ -e "$1" ] && {
          [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping."
        } || {
-         eval $EXEC &
+         eval $EXEC
        }
 }
 
@@ -153,7 +153,7 @@ apply_cfgfile() {
             create_file "${TNAME}" &
            ;;
       "d")  [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-."
-            mk_dir "${TNAME}" &
+            mk_dir "${TNAME}"
            # Add check to see if there's an entry in fstab to mount.
            ;;
       *)    [ "${VERBOSE}" != "no" ] && echo "Invalid type -${TTYPE}-."

diff --git a/meta/recipes-core/initscripts/initscripts_1.0.bb b/meta/recipes-core/initscripts/initscripts_1.0.bb
index 1d80c55b28c9553cb586f5ffcda074d2933e136b..b741b61f37912073d341220f0dfe0d88b7d856c7 100644 (file)
--- a/meta/recipes-core/initscripts/initscripts_1.0.bb
+++ b/meta/recipes-core/initscripts/initscripts_1.0.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Initscripts provide the basic system startup initialization scrip
 SECTION = "base"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-PR = "r135"
+PR = "r136"
 
 INHIBIT_DEFAULT_DEPS = "1"