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
37 lines
983 B
Bash
Executable File
37 lines
983 B
Bash
Executable File
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
[ -n "$TARGET_ROOT" ]
|
|
|
|
# Prevent package installs from starting daemons
|
|
sudo mv $TARGET_ROOT/sbin/start-stop-daemon $TARGET_ROOT/sbin/start-stop-daemon.REAL
|
|
sudo dd of=$TARGET_ROOT/sbin/start-stop-daemon <<EOF
|
|
#!/bin/sh
|
|
echo
|
|
echo "Warning: Fake start-stop-daemon called, doing nothing"
|
|
EOF
|
|
sudo chmod 755 $TARGET_ROOT/sbin/start-stop-daemon
|
|
|
|
if [ -f $TARGET_ROOT/sbin/initctl ]; then
|
|
sudo mv $TARGET_ROOT/sbin/initctl $TARGET_ROOT/sbin/initctl.REAL
|
|
sudo dd of=$TARGET_ROOT/sbin/initctl <<EOF
|
|
#!/bin/sh
|
|
echo "initctl (tripleo 1.0)"
|
|
echo "Warning: Fake initctl called, doing nothing"
|
|
EOF
|
|
sudo chmod 755 $TARGET_ROOT/sbin/initctl
|
|
fi
|
|
|
|
sudo dd of=$TARGET_ROOT/usr/sbin/policy-rc.d <<EOF
|
|
#!/bin/sh
|
|
# 101 Action not allowed. The requested action will not be performed because
|
|
# of runlevel or local policy constraints.
|
|
exit 101
|
|
EOF
|
|
sudo chmod 755 $TARGET_ROOT/usr/sbin/policy-rc.d
|