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
69 lines
1.5 KiB
Bash
Executable File
69 lines
1.5 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
SCRIPTNAME=$(basename $0)
|
|
function show_options () {
|
|
echo "Usage: $SCRIPTNAME -d <directory>"
|
|
echo
|
|
echo "Options:"
|
|
echo " -d -- directory to search for package-installs-* files"
|
|
exit 1
|
|
}
|
|
|
|
TEMP=$(getopt -o hd: -n $SCRIPTNAME -- "$@")
|
|
if [ $? != 0 ] ; then echo "Terminating..." >&2 ; exit 1 ; fi
|
|
eval set -- "$TEMP"
|
|
|
|
WORKDIR=
|
|
|
|
while true ; do
|
|
case "$1" in
|
|
-d) WORKDIR=$2; shift 2;;
|
|
-h) show_options;;
|
|
--) shift ; break ;;
|
|
*) echo "Error: unsupported option $1."; exit 1;;
|
|
esac
|
|
done
|
|
|
|
if [ -z "$WORKDIR" ]; then
|
|
show_options
|
|
fi
|
|
|
|
PACKAGES=
|
|
|
|
for PACKAGEFILE in $(find $WORKDIR -maxdepth 1 -name "package-installs-*" ); do
|
|
basefile=$(basename $PACKAGEFILE)
|
|
element_name=${basefile#"package-installs-"}
|
|
while read pkg; do
|
|
if [ -z "$pkg" ]; then
|
|
continue
|
|
fi
|
|
# Ignore comments
|
|
if [ ${pkg:0:1} = "#" ]; then
|
|
continue
|
|
fi
|
|
if [ ${pkg:0:1} = "-" ]; then
|
|
pkg=${pkg:1}
|
|
fi
|
|
|
|
if [ -e /usr/share/pkg-map/$element_name ]; then
|
|
# map the package to its true name
|
|
set +e
|
|
map_pkg=$(pkg-map --element $element_name $pkg)
|
|
if [ $? -eq 0 ]; then
|
|
pkg=$map_pkg
|
|
fi
|
|
set -e
|
|
fi
|
|
|
|
PACKAGES="$PACKAGES $pkg"
|
|
done < $PACKAGEFILE
|
|
done
|
|
|
|
install-packages $PACKAGES
|