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
27 lines
711 B
Bash
Executable File
27 lines
711 B
Bash
Executable File
#!/bin/bash
|
|
# The base image created by kiwi does not contain an initrd so create one
|
|
# here.
|
|
|
|
if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
|
|
set -x
|
|
fi
|
|
set -eu
|
|
set -o pipefail
|
|
|
|
# To have access to FS_TYPE
|
|
_LIB="/tmp/opensuse-extras"
|
|
source $_LIB/img-defaults
|
|
|
|
# This is to tell mkinitrd to include the right tools for the root filesystem
|
|
# that will actually be used for the final image. This is likely something
|
|
# different than what the chroot is currently on (which might currently be a
|
|
# tmpfs even).
|
|
echo "rootfstype=$FS_TYPE" > /etc/sysconfig/initrd
|
|
|
|
# openSuse mkinitrd requires a valid root device be in fstab.
|
|
sed -i 's/vda1/sda1/' /etc/fstab
|
|
mkinitrd -A -B
|
|
|
|
# And cleanup again
|
|
rm /etc/sysconfig/initrd
|