From 48ce0fde510a47d6d6e7bbfe1e75bc5ea63e9cac Mon Sep 17 00:00:00 2001 From: Ghe Rivero Date: Wed, 22 Oct 2014 13:49:37 +0200 Subject: [PATCH] export DIB_ROOT_LABEL to make it global It is needed by the debian element in the root.d phase. (enviroment.d variables are not available after the base image is built) Change-Id: Idb8f9795a619687569bcb0de774c87333d11b292 Closes-Bug: #1384103 --- bin/disk-image-create | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/bin/disk-image-create b/bin/disk-image-create index e148d85e..33489c7a 100755 --- a/bin/disk-image-create +++ b/bin/disk-image-create @@ -89,7 +89,7 @@ function show_options () { INSTALL_PACKAGES="" IMAGE_TYPES=("qcow2") COMPRESS_IMAGE="true" -DIB_ROOT_LABEL="" +export DIB_ROOT_LABEL="" TEMP=`getopt -o a:ho:t:xucnp: -l no-tmpfs,offline,help,min-tmpfs:,image-size:,image-cache:,max-online-resize:,qemu-img-options:,ramdisk-element:,root-label: -n $SCRIPTNAME -- "$@"` if [ $? -ne 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi @@ -158,8 +158,6 @@ fi mk_build_dir create_base -# This variable needs to be propagated into the chroot -echo "export DIB_ROOT_LABEL=\"${DIB_ROOT_LABEL}\"" > $TMP_HOOKS_PATH/environment.d/10-dib-root-label.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