From 94275558dee8c7f519ecf8e17c6bfd4b1c48ba45 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 11 Apr 2017 22:38:18 -0400 Subject: [PATCH] Make sure variables are exported for run-parts in 999-extras.binary; and drop the unnecessary sourcing of functions. --- live-build/ubuntu-cpc/hooks/999-extras.binary | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks/999-extras.binary b/live-build/ubuntu-cpc/hooks/999-extras.binary index c897359b..39c464de 100755 --- a/live-build/ubuntu-cpc/hooks/999-extras.binary +++ b/live-build/ubuntu-cpc/hooks/999-extras.binary @@ -8,12 +8,9 @@ if [ ! -d ${my_dir}/extra ]; then exit 0 fi -IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process" -CLOUD_IMG_STR="$IMAGE_STR" -FS_LABEL="cloudimg-rootfs" - -# Export the common functions to the extras -. config/functions +export IMAGE_STR="# CLOUD_IMG: This file was created/modified by the Cloud Image build process" +export CLOUD_IMG_STR="$IMAGE_STR" +export FS_LABEL="cloudimg-rootfs" # Cleaner execution /bin/run-parts --regex ".*\.binary" "${extra_d}"