diff options
| author | Mans Rullgard <mans@mansr.com> | 2016-12-16 16:28:38 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-22 08:50:16 +0000 |
| commit | 1fac14dd8fd8420daf7071d5bcee073ee62990d1 (patch) | |
| tree | c8271310b414c4cb2fdc54614e525f5fbc1a4bcb | |
| parent | 1988bae5bfed203ddf889a7def2a49422e5d5e60 (diff) | |
| download | poky-1fac14dd8fd8420daf7071d5bcee073ee62990d1.tar.gz | |
initscripts: populate-volatile: don't run commands in background
If commands are run asynchronously they may be completed out of
order causing problems if later entries depend on earlier ones.
(From OE-Core rev: bead9e59768209dd70f9cba51d2f1e5925cc284d)
Signed-off-by: Mans Rullgard <mans@mansr.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rwxr-xr-x | meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | 6 |
1 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 91514bac86..cf0d2bf966 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/populate-volatile.sh | |||
| @@ -36,7 +36,7 @@ create_file() { | |||
| 36 | [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." | 36 | [ "${VERBOSE}" != "no" ] && echo "Target already exists. Skipping." |
| 37 | } || { | 37 | } || { |
| 38 | if [ -z "$ROOT_DIR" ]; then | 38 | if [ -z "$ROOT_DIR" ]; then |
| 39 | eval $EXEC & | 39 | eval $EXEC |
| 40 | else | 40 | else |
| 41 | # Creating some files at rootfs time may fail and should fail, | 41 | # Creating some files at rootfs time may fail and should fail, |
| 42 | # but these failures should not be logged to make sure the do_rootfs | 42 | # but these failures should not be logged to make sure the do_rootfs |
| @@ -86,7 +86,7 @@ link_file() { | |||
| 86 | test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.cache.build | 86 | test "$VOLATILE_ENABLE_CACHE" = yes && echo " $EXEC" >> /etc/volatile.cache.build |
| 87 | 87 | ||
| 88 | if [ -z "$ROOT_DIR" ]; then | 88 | if [ -z "$ROOT_DIR" ]; then |
| 89 | eval $EXEC & | 89 | eval $EXEC |
| 90 | else | 90 | else |
| 91 | # For the same reason with create_file(), failures should | 91 | # For the same reason with create_file(), failures should |
| 92 | # not be logged. | 92 | # not be logged. |
| @@ -187,7 +187,7 @@ apply_cfgfile() { | |||
| 187 | 187 | ||
| 188 | case "${TTYPE}" in | 188 | case "${TTYPE}" in |
| 189 | "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." | 189 | "f") [ "${VERBOSE}" != "no" ] && echo "Creating file -${TNAME}-." |
| 190 | create_file "${TNAME}" & | 190 | create_file "${TNAME}" |
| 191 | ;; | 191 | ;; |
| 192 | "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." | 192 | "d") [ "${VERBOSE}" != "no" ] && echo "Creating directory -${TNAME}-." |
| 193 | mk_dir "${TNAME}" | 193 | mk_dir "${TNAME}" |
