From 82b328bb1334242eee49acfbc47673a621f04852 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Fri, 1 May 2015 16:37:56 -0400 Subject: [PATCH] Fix $DIB_DEFAULT_INSTALLTYPE export statement $DIB_DEFAULT_INSTALLTYPE is propogated into the chroot by writing out an export statement to a file under environment.d. However, that export statement does not account for other elements that may choose to define $DIB_DEFAULT_INSTALLTYPE earlier on in their own environment.d files. Change-Id: I5865b1859c080c328251e8dce072c0634ef75c16 --- bin/disk-image-create | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/disk-image-create b/bin/disk-image-create index 3b9e5c5f2..2778218b4 100755 --- a/bin/disk-image-create +++ b/bin/disk-image-create @@ -206,7 +206,7 @@ mk_build_dir create_base # This variable needs to be propagated into the chroot mkdir -p $TMP_HOOKS_PATH/environment.d -echo "export DIB_DEFAULT_INSTALLTYPE=\"${DIB_DEFAULT_INSTALLTYPE}\"" > $TMP_HOOKS_PATH/environment.d/11-dib-install-type.bash +echo "export DIB_DEFAULT_INSTALLTYPE=\${DIB_DEFAULT_INSTALLTYPE:-\"${DIB_DEFAULT_INSTALLTYPE}\"}" > $TMP_HOOKS_PATH/environment.d/11-dib-install-type.bash run_d extra-data # Run pre-install scripts. These do things that prepare the chroot for package installs run_d_in_target pre-install