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
58 lines
1.4 KiB
Bash
Executable file
58 lines
1.4 KiB
Bash
Executable file
#!/bin/bash
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
source $_LIB/die
|
|
[ -n "$IMAGE_BLOCK_DEVICE" ] || die "Image block device not set"
|
|
|
|
# Create 2 partitions for PPC, one for PReP boot and other for root
|
|
if [[ "$ARCH" =~ "ppc" ]] ; then
|
|
sudo sfdisk --force $IMAGE_BLOCK_DEVICE << EOF
|
|
0,8,41 *
|
|
,,L
|
|
;
|
|
EOF
|
|
else
|
|
# Create 1 partition far enough up the disk to permit grub to be installed on
|
|
# the MBR.
|
|
sudo sfdisk $IMAGE_BLOCK_DEVICE << EOF
|
|
1 - - *
|
|
0 0;
|
|
0 0;
|
|
0 0;
|
|
EOF
|
|
fi
|
|
|
|
sudo partprobe $IMAGE_BLOCK_DEVICE
|
|
|
|
# To ensure no race conditions exist from calling partprobe
|
|
sudo udevadm settle
|
|
|
|
# If the partition isn't under /dev/loop*p1, create it with kpartx
|
|
DM=
|
|
if [ ! -e "${IMAGE_BLOCK_DEVICE}p1" ]; then
|
|
DM=${IMAGE_BLOCK_DEVICE/#\/dev/\/dev\/mapper}
|
|
# If running inside Docker, make our nodes manually, because udev will not be working.
|
|
if [ -f /.dockerenv ]; then
|
|
# kpartx cannot run in sync mode in docker.
|
|
sudo kpartx -av $TMP_IMAGE_PATH
|
|
sudo dmsetup --noudevsync mknodes
|
|
else
|
|
sudo kpartx -asv $TMP_IMAGE_PATH
|
|
fi
|
|
elif [[ "$ARCH" =~ "ppc" ]]; then
|
|
sudo kpartx -asv $TMP_IMAGE_PATH
|
|
fi
|
|
|
|
if [ -n "$DM" ]; then
|
|
echo "IMAGE_BLOCK_DEVICE=${DM}p1"
|
|
elif [[ "$ARCH" =~ "ppc" ]]; then
|
|
DM=${IMAGE_BLOCK_DEVICE/#\/dev/\/dev\/mapper}
|
|
echo "IMAGE_BLOCK_DEVICE=${DM}p2"
|
|
else
|
|
echo "IMAGE_BLOCK_DEVICE=${IMAGE_BLOCK_DEVICE}p1"
|
|
fi
|