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
49 lines
1.2 KiB
Bash
Executable file
49 lines
1.2 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
_LIB="/tmp/ramdisk-build"
|
|
|
|
source $_LIB/common-defaults
|
|
source $_LIB/img-defaults
|
|
source $_LIB/ramdisk-defaults
|
|
|
|
source $_LIB/common-functions
|
|
source $_LIB/img-functions
|
|
source $_LIB/ramdisk-functions
|
|
|
|
KERNEL_VERSION=${DIB_KERNEL_VERSION:-$(find_kernel_version)}
|
|
MODULE_DIR=$MODULE_ROOT/lib/modules/$KERNEL_VERSION
|
|
FIRMWARE_DIR=$MODULE_ROOT/lib/firmware
|
|
LIB_UDEV=$LIB_UDEV_ROOT/lib/udev
|
|
INIT="$_LIB/scripts/init"
|
|
FUNCTIONS_D="$_LIB/scripts/d"
|
|
BUSYBOX=${BUSYBOX:-$(which busybox)}
|
|
# NOTE(bnemec): IMAGE_ELEMENT is normally set in disk-image-create, but we're
|
|
# not using that to build the image here.
|
|
IMAGE_ELEMENT=
|
|
|
|
mk_build_dir
|
|
mkdir -p $TMP_BUILD_DIR/mnt
|
|
export TMP_HOOKS_PATH=/tmp
|
|
export TMP_MOUNT_PATH=$TMP_BUILD_DIR/mnt
|
|
|
|
echo "building ramdisk in $TMP_MOUNT_PATH"
|
|
|
|
create_ramdisk_base
|
|
populate_lib
|
|
populate_busybox
|
|
populate_init
|
|
populate_udev
|
|
SCRIPT_HOME=/tmp/in_target.d/bin TMP_HOOKS_PATH=/tmp/in_target.d run_d ramdisk-install
|
|
finalise_image
|
|
save_image /tmp/ramdisk
|
|
# In the past save_image did this for us. If EXIT handler is not
|
|
# reset ramdisk image builds fail.
|
|
trap EXIT
|
|
cp /boot/vmlinu[zx]-${KERNEL_VERSION} /tmp/kernel
|
|
chmod o+r /tmp/kernel
|