aboutsummaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initscripts
diff options
context:
space:
mode:
authorChristopher Larson <chris_larson@mentor.com>2012-07-20 10:05:03 -0700
committerSaul Wold <sgw@linux.intel.com>2012-07-25 00:11:37 -0700
commit138c3c26830e48a56ca7cb3e5feca324d13ec89c (patch)
tree519a034872bdccd3d6f18c8334c9c10796fb762b /meta/recipes-core/initscripts
parent4148bc80c008d25c8a536c7c7dfdeac1669a6662 (diff)
downloadopenembedded-core-contrib-138c3c26830e48a56ca7cb3e5feca324d13ec89c.tar.gz
openembedded-core-contrib-138c3c26830e48a56ca7cb3e5feca324d13ec89c.tar.bz2
openembedded-core-contrib-138c3c26830e48a56ca7cb3e5feca324d13ec89c.zip
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>
Diffstat (limited to 'meta/recipes-core/initscripts')
-rwxr-xr-xmeta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh4
-rw-r--r--meta/recipes-core/initscripts/initscripts_1.0.bb2
2 files changed, 3 insertions, 3 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 4a99aff6a41..d2175d7a7cc 100755
--- 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 1d80c55b28c..b741b61f379 100644
--- 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"