36b59c001c
There is a wide variety of tracing options through the various shell
scripts. Some use "set -eux", others explicity set xtrace and others
do nothing. There is a "-x" option to bin/disk-image-create but it
doesn't flow down to the many scripts it calls.
This adds a global integer variable set by disk-image-create
DIB_DEBUG_TRACE. All scripts have a stanza added to detect this and
turn on tracing. Any other tracing methods are rolled into this. So
the standard header is
---
if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
set -x
fi
set -eu
set -o pipefail
---
Multiple -x options can be specified to dib-create-image, which
increases the value of DIB_DEBUG_TRACE. If script authors feel their
script should only trace at higher levels, they should modify the
"-gt" value. If they feel it should trace by default, they can modify
the default value also.
Changes to pachset 16 : scripts which currently trace themselves by
default have retained this behaviour with DIB_DEBUG_TRACE defaulting
to "1". This was done by running [1] on patch set 15. See the thread
beginning at [2]
dib-lint is also updated to look for the variable being matched.
[1] https://gist.github.com/ianw/71bbda9e6acc74ccd0fd
[2] http://lists.openstack.org/pipermail/openstack-dev/2014-November/051575.html
Change-Id: I6c5a962260741dcf6f89da9a33b96372a719b7b0
75 lines
2.0 KiB
Bash
Executable File
75 lines
2.0 KiB
Bash
Executable File
#!/bin/bash
|
|
# Save the HTTP/[S] and noproxy settings if available.
|
|
# XXX: Obviously not suitable for downloadable images.
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
have_apt=
|
|
have_yum=
|
|
have_zypper=
|
|
http_proxy=${http_proxy:-""}
|
|
https_proxy=${https_proxy:-""}
|
|
|
|
if [ -d /etc/apt ] ; then
|
|
have_apt=1
|
|
fi
|
|
if [ -e /etc/yum.conf ] ; then
|
|
have_yum=1
|
|
fi
|
|
if [ -d /etc/zypp ] ; then
|
|
have_zypper=1
|
|
fi
|
|
|
|
if [ -n "$http_proxy" ]; then
|
|
if [ -d ~stack ]; then
|
|
echo export http_proxy=$http_proxy >> ~stack/.profile
|
|
fi
|
|
if [ -n "$have_apt" ] ; then
|
|
echo "Acquire::http::Proxy \"$http_proxy\";" > /etc/apt/apt.conf.d/02-use-http-proxy
|
|
fi
|
|
if [ -n "$have_yum" ] ; then
|
|
sed -i -e "s,\[main\],[main]\nproxy=$http_proxy," /etc/yum.conf
|
|
fi
|
|
if [ -n "$have_zypper" ] ; then
|
|
sed -i -e "s,^HTTP_PROXY=.*$,HTTP_PROXY=\"$http_proxy\"," /etc/sysconfig/proxy
|
|
fi
|
|
fi
|
|
|
|
if [ -n "$https_proxy" ]; then
|
|
if [ -d ~stack ]; then
|
|
echo export https_proxy=$https_proxy >> ~stack/.profile
|
|
fi
|
|
if [ -n "$have_apt" ] ; then
|
|
echo "Acquire::https::Proxy \"$https_proxy\";" > /etc/apt/apt.conf.d/02-use-https-proxy
|
|
fi
|
|
if [ -n "$have_zypper" ] ; then
|
|
sed -i -e "s,^HTTPS_PROXY=.*$,HTTPS_PROXY=\"$https_proxy\"," /etc/sysconfig/proxy
|
|
fi
|
|
fi
|
|
|
|
no_proxy=${no_proxy:+"$no_proxy,192.0.2.1"}
|
|
no_proxy=${no_proxy:-"192.0.2.1"}
|
|
if [ -n "$no_proxy" ]; then
|
|
if [ -d ~stack ]; then
|
|
echo export no_proxy=$no_proxy >> ~stack/.profile
|
|
fi
|
|
if [ -n "$have_apt" ] ; then
|
|
for host in $(sed 's/,/ /g' <<<$no_proxy); do
|
|
echo "Acquire::http::Proxy::$host \"DIRECT\";" >> /etc/apt/apt.conf.d/02-no-proxy
|
|
done
|
|
fi
|
|
if [ -n "$have_zypper" ] ; then
|
|
sed -i -e "s,^\(NO_PROXY=.*\)\"$,\1\, $no_proxy\"," /etc/sysconfig/proxy
|
|
fi
|
|
fi
|
|
|
|
if [ -n "$http_proxy" -o -n "$https_proxy" -o -n "$no_proxy" ]; then
|
|
if [ -n "$have_zypper" ] ; then
|
|
sed -i -e "s,^PROXY_ENABLED=.*$,PROXY_ENABLED=\"yes\"," /etc/sysconfig/proxy
|
|
fi
|
|
fi
|