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
77 lines
2.9 KiB
Bash
Executable File
77 lines
2.9 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"
|
|
MODULE="$_LIB/scripts/module"
|
|
# 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"
|
|
|
|
populate_init
|
|
SCRIPT_HOME=/tmp/in_target.d/bin TMP_HOOKS_PATH=/tmp/in_target.d run_d ramdisk-install
|
|
MODULE_PATH="/usr/lib/dracut/modules.d"
|
|
cp -r "$MODULE" "$MODULE_PATH/80deploy-ramdisk"
|
|
mv "$TMP_MOUNT_PATH/init" "$MODULE_PATH/80deploy-ramdisk/init.sh"
|
|
|
|
# NOTE(bnemec): Workaround for bug in Dracut. This fix has been proposed to
|
|
# Dracut as well in https://github.com/haraldh/dracut/pull/34 , and once it has
|
|
# been released for all of our supported platforms we can remove this. Until then
|
|
# this makes --include work correctly and will be a noop if we're running a fixed
|
|
# Dracut version.
|
|
sed -i 's|cp --reflink=auto --sparse=auto -fa -t "$s" "$i"$|cp --reflink=auto --sparse=auto -fa -t "${initdir}/${tgt}" "$i"|g' $(which dracut)
|
|
|
|
# Notes on the options passed to Dracut:
|
|
# -N: Do not build a host-specific ramdisk. We want to be able to run this ramdisk
|
|
# on as many different machines as possible.
|
|
# --install: A list of the binaries needed by our ramdisk script fragments.
|
|
# --kernel-cmdline: Kernel parameters to pass to the ramdisk. rd.neednet is required
|
|
# to force Dracut to bring up networking even if it isn't passed a
|
|
# network target root. Pre-loading the ahci module is necessary
|
|
# on some systems to ensure that SATA disks are recognized.
|
|
# --include: Files from the chroot to include in the ramdisk.
|
|
# --kver: The kernel version to use, as determined above.
|
|
# --add-drivers: Extra kernel modules to include in the ramdisk.
|
|
# -o: Force omission of these dracut modules. Our scripts are written for bash,
|
|
# so dash is not desirable, and plymouth was causing some issues on Ubuntu.
|
|
dracut -N \
|
|
--install "$(cat /etc/dib_binary_deps)" \
|
|
--kernel-cmdline "rd.shell rd.debug rd.neednet=1 rd.driver.pre=ahci" \
|
|
--include "$TMP_MOUNT_PATH/" / \
|
|
--kver "${KERNEL_VERSION}" \
|
|
--add-drivers "virtio virtio_net virtio_blk" \
|
|
-o "dash plymouth" \
|
|
/tmp/ramdisk
|
|
|
|
cp "/boot/vmlinuz-${KERNEL_VERSION}" /tmp/kernel
|
|
chmod o+r /tmp/kernel
|
|
# We don't want to run cleanup (set in mk_build_dir above) when this exits
|
|
trap EXIT
|