Make sure variables are exported for run-parts in 999-extras.binary; and drop the unnecessary sourcing of functions.

ubuntu/zesty
Mathieu Trudel-Lapierre 8 years ago
parent 6272f60665
commit 94275558de

@ -8,12 +8,9 @@ if [ ! -d ${my_dir}/extra ]; then
exit 0 exit 0
fi fi
IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process" export IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process"
CLOUD_IMG_STR="$IMAGE_STR" export CLOUD_IMG_STR="$IMAGE_STR"
FS_LABEL="cloudimg-rootfs" export FS_LABEL="cloudimg-rootfs"
# Export the common functions to the extras
. config/functions
# Cleaner execution # Cleaner execution
/bin/run-parts --regex ".*\.binary" "${extra_d}" /bin/run-parts --regex ".*\.binary" "${extra_d}"

Loading…
Cancel
Save