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
32 lines
1.0 KiB
Bash
Executable File
32 lines
1.0 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
# Must manually remove grub2 here, otherwise the download below does not work.
|
|
yum remove -y grub2
|
|
|
|
# Remove all old versions of grub2 from the yum cache and then ensure the
|
|
# latest version is in the cache.
|
|
basearch=$(cat /etc/yum/vars/basearch)
|
|
find /tmp/yum/$basearch -regex ".*/grub2-[0-9].*\.rpm" -exec rm -f {} +
|
|
install-packages -d grub2
|
|
|
|
# Copy grub2 rpm out of mounted yum cache for install during finalise
|
|
mkdir -p /tmp/grub
|
|
cp $(find /tmp/yum/$basearch -regex ".*/grub2-[0-9].*\.rpm") /tmp/grub
|
|
echo "rpm -i /tmp/grub/*.rpm" > /tmp/grub/install
|
|
|
|
#GRUB_CFG=/boot/grub2/grub.cfg
|
|
|
|
#[ -f "$GRUB_CFG" ]
|
|
|
|
# Update the config to have the search UUID of the image being built.
|
|
# When partition staging is moved to a separate stage, this will need to happen
|
|
# there. This generates a non-UUID config, which is irrelevant for booting with
|
|
# hypervisor kernel + ramdisk, and fixed up by 51-grub for vm images.
|
|
#GRUB_DISABLE_LINUX_UUID=true grub2-mkconfig -o $GRUB_CFG
|