
This commit will merge into trove, the trove-integration tree as of commit 9f92ca853f8aa2f72921e54682c918941a8f0919. This is in preparation for making trove-integration go away. In addition, it supresses any consideration of the integration directory in the trove tox tests as it is understandably a small pile of pooh and in need of much cleanup. Change-Id: Ib7f2655c4c5ed86b5454708c04371ee55e37ec2d Partially-Implements-Blueprint: eliminate-trove-integration-and-redstack
22 lines
646 B
Bash
Executable File
22 lines
646 B
Bash
Executable File
#!/bin/bash
|
|
# Override the default /etc/apt/apt.conf.d directory with $DIB_APT_CONF_DIR
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
# exit directly if DIB_APT_CONF_DIR is not defined properly
|
|
if [ -z "${DIB_APT_CONF_DIR:-}" ] ; then
|
|
echo "DIB_APT_CONF_DIR is not set - no apt.conf.d will be copied in"
|
|
exit 0
|
|
elif [ ! -d "$DIB_APT_CONF_DIR" ] ; then
|
|
echo "$DIB_APT_CONF_DIR is not a valid apt.conf.d directory."
|
|
echo "You should assign a proper apt.conf.d directory in DIB_APT_CONF_DIR"
|
|
exit 1
|
|
fi
|
|
|
|
# copy the apt.conf to cloudimg
|
|
sudo cp -L -f -R $DIB_APT_CONF_DIR $TMP_MOUNT_PATH/etc/apt
|