06ccb7484f
In the bash script "99-override-default-apt-conf" 'set -u' is being used to check for uninitialised variables. This resulted in generic 'unbound variable' messages rather than the intended error messages. Tweaked the check for DIB_APT_CONF to work if the variable is unbound; so that we get the intended error message rather than the `unbound variable` message. Change-Id: Ib8e287060f32312ab80dd7f44e2792ecca48edbb
18 lines
521 B
Bash
Executable File
18 lines
521 B
Bash
Executable File
#!/bin/bash
|
|
# Override the default /etc/apt/apt.conf with $DIB_APT_CONF
|
|
|
|
set -ue
|
|
|
|
# exit directly if DIB_APT_CONF is not defined properly
|
|
if [ -z "${DIB_APT_CONF:-}" ] ; then
|
|
echo "DIB_APT_CONF is not set - no apt.conf will be copied in"
|
|
exit 0
|
|
elif [ ! -f "$DIB_APT_CONF" ] ; then
|
|
echo "$DIB_APT_CONF is not a valid apt.conf file."
|
|
echo "You should assign a proper apt.conf file in DIB_APT_CONF"
|
|
exit 1
|
|
fi
|
|
|
|
# copy the apt.conf to cloudimg
|
|
sudo cp -L -f $DIB_APT_CONF $TMP_MOUNT_PATH/etc/apt/apt.conf
|