Merge "Standarise tracing for scripts"

bin/dib-lint

@@ -94,7 +94,8 @@ for i in $(find elements -type f); do
         fi
     fi
 
-    # Check that all scripts are set -eu -o pipefail
+    # Check that all scripts are set -eu -o pipefail and look for
+    # DIB_DEBUG_TRACE
     # NOTE(bnemec): This doesn't verify that the set call occurs high
     # enough in the file to be useful, but hopefully nobody will be
     # sticking set calls at the end of their file to trick us.  And if
@@ -119,6 +120,11 @@ for i in $(find elements -type f); do
                 error "$i is not set -o pipefail"
             fi
         fi
+        if ! excluded dibdebugtrace; then
+            if [ -z "$(grep "DIB_DEBUG_TRACE" $i)" ]; then
+                error "$i does not follow DIB_DEBUG_TRACE"
+            fi
+        fi
     fi
 done
 

bin/disk-image-create

@@ -106,7 +106,7 @@ while true ; do
         -o) export IMAGE_NAME=$2; shift 2 ;;
         -t) IFS="," read -a IMAGE_TYPES <<< "$2"; export IMAGE_TYPES ; shift 2 ;;
         -h|--help) show_options; exit 0;;
-        -x) shift; set -x;;
+        -x) shift; export DIB_DEBUG_TRACE=$(( $DIB_DEBUG_TRACE + 1 )); set -x;;
         -u) shift; export COMPRESS_IMAGE="";;
         -c) shift ; export CLEAR_ENV=1;;
         -n) shift; export SKIP_BASE="1";;

elements/apt-conf/extra-data.d/99-override-default-apt-conf

@@ -1,7 +1,10 @@
 #!/bin/bash
 # Override the default /etc/apt/apt.conf with $DIB_APT_CONF
 
-set -ue
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 # exit directly if DIB_APT_CONF is not defined properly

elements/apt-preferences/extra-data.d/99-set-apt-package-pins

@@ -14,6 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/apt-sources/extra-data.d/99-override-default-apt-sources

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Override the default /etc/apt/sources.list with $DIB_APT_SOURCES
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/architecture-emulation-binaries/cleanup.d/01-cleanbinary

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 if [ -x "$TMP_MOUNT_PATH/tmp/clean_up_qemu_binary" ] ; then

elements/architecture-emulation-binaries/extra-data.d/01-copy-binary

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 function clean_up_arch_emulation {

elements/baremetal/cleanup.d/99-extract-kernel-and-ramdisk

@@ -14,6 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/cleanup.d/01-ccache

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/cleanup.d/99-tidy-logs

@@ -16,7 +16,10 @@
 # under the License.
 #
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 # Truncate /var/log files in preparation for first boot

elements/base/dib-init-system

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/extra-data.d/50-store-build-settings

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Store the build-time environment and command line arguments
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/extra-data.d/99-enable-install-types

@@ -13,8 +13,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 declare -a SPECIFIED_ELEMS

elements/base/install.d/00-baseline-environment

@@ -1,6 +1,9 @@
 #!/bin/bash
 # These are useful, or at worst not harmful, for all images we build.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/install.d/10-cloud-init

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Tweak the stock ubuntu cloud-init config
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/install.d/50-store-build-settings

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Store build-time environment and command line arguments
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/install.d/99-dkms

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/install.d/99-up-to-date

@@ -2,6 +2,9 @@
 # Fully upgrade everything on the system (if the package manager knows how to
 # do it).
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/pre-install.d/03-baseline-tools

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Install baseline packages and tools.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/pre-install.d/04-dib-init-system

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/base/root.d/01-ccache

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/cache-url/bin/cache-url

@@ -15,6 +15,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/centos-minimal/root.d/08-rinse

@@ -14,6 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
+
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/centos7/pre-install.d/01-yum-repos

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/centos7/root.d/10-centos7-cloud-image

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/cleanup-kernel-initrd/cleanup.d/99-cleanup-kernel-initrd

@@ -15,7 +15,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 source $_LIB/img-functions

elements/cloud-init-datasources/install.d/05-set-cloud-init-sources

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/cloud-init-nocloud/install.d/05-inject-local-source-data

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/debian-systemd/root.d/05-debian-systemd

@@ -1,6 +1,11 @@
 #!/bin/bash
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
+
 cat > ${TARGET_ROOT}/.extra_settings << EOF
 DIB_DEBIAN_ALT_INIT_PACKAGE=systemd-sysv
 EOF

elements/debian-upstart/root.d/05-debian-upstart

@@ -1,5 +1,9 @@
 #!/bin/bash
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 cat > ${TARGET_ROOT}/.extra_settings << EOF

elements/debian-upstart/root.d/20-debian-fix-upstart-jobs

@@ -1,6 +1,11 @@
 #!/bin/bash
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
+
 # Working around bug in Debian cloud-init packages with upstart
 # where startpar will wait forever for these because they are tasks
 # http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735204

elements/debian/bin/map-services

@@ -1,4 +1,8 @@
 #!/bin/bash
+
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/debian/root.d/08-debootstrap

@@ -14,8 +14,13 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
+
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
+
 if [ -f ${TARGET_ROOT}/.extra_settings ] ; then
     . ${TARGET_ROOT}/.extra_settings
 fi

elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces

@@ -1,5 +1,9 @@
 #!/bin/bash
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 SCRIPTDIR=$(dirname $0)

elements/dhcp-all-interfaces/install.d/60-remove-cloud-image-interfaces

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dib-run-parts/root.d/90-base-dib-run-parts

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/disable-selinux/post-install.d/15-disable-selinux

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dkms/post-install.d/99-dkms

@@ -2,6 +2,9 @@
 # Trigger a run of dkms for all the modules installed
 # to ensure we have valid modules build for all.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/bin/install-packages

@@ -14,6 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/cleanup.d/40-unblock-daemons

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/cleanup.d/50-remove-img-build-proxy

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/cleanup.d/60-untrim-dpkg

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/extra-data.d/01-copy-apt-keys

@@ -14,6 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/finalise.d/99-clean-up-cache

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Do an apt-get clean. This will free some space.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/finalise.d/99-write-dpkg-manifest

@@ -14,7 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 DPKG_MANIFEST_NAME=dib-manifest-dpkg-$(basename ${IMAGE_NAME})

elements/dpkg/pre-install.d/00-disable-apt-recommends

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Prevent apt from installing recommended packages
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/pre-install.d/01-dpkg-install-bin

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/pre-install.d/02-add-apt-keys

@@ -14,6 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/pre-install.d/99-apt-get-update

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Do an apt-get update, so that packages can be installed.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/root.d/50-build-with-http-cache

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/root.d/60-block-apt-translations

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/root.d/99-block-daemons

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/root.d/99-shared_apt_cache

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dpkg/root.d/99-trim-dpkg

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dracut-network/finalise.d/98-regenerate-initramfs

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dracut-network/install.d/11-patch-dracut

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/dracut-ramdisk/extra-data.d/scripts/module/deploy-cmdline.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # NOTE(bnemec): Dracut doesn't like it if we enable these
-# dib-lint: disable=setu sete setpipefail
+# dib-lint: disable=setu sete setpipefail dibdebugtrace
 
 # We never let Dracut boot off the specified root anyway, so all
 # we need is a value it will accept.

elements/dracut-ramdisk/extra-data.d/scripts/module/module-setup.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # Dracut is bash too, and it doesn't play nicely with our usual sets
-# dib-lint: disable=setu sete setpipefail
+# dib-lint: disable=setu sete setpipefail dibdebugtrace
 
 check() {
     return 0

elements/dracut-ramdisk/install.d/20-install-dracut-deps

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 DRACUT_NETWORK="dracut-network"

elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk

@@ -1,8 +1,12 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
+
 _LIB="/tmp/ramdisk-build"
 
 source "$_LIB/common-defaults"

elements/element-manifest/extra-data.d/75-inject-element-manifest

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 DIB_ELEMENT_MANIFEST_PATH=${DIB_ELEMENT_MANIFEST_PATH:-"$DIB_MANIFEST_IMAGE_DIR/dib-element-manifest"}

elements/enable-serial-console/install.d/20-stty

@@ -1,6 +1,11 @@
 #!/bin/bash
-set -uex
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
+
 SCRIPTDIR=$(dirname $0)
 
 DIB_INIT_SYSTEM=$(dib-init-system)

elements/epel/pre-install.d/05-rpm-epel-release

@@ -1,4 +1,8 @@
 #!/bin/bash
+
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/fedora/pre-install.d/01-set-fedora-mirror

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/fedora/root.d/10-fedora-cloud-image

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/ilo/extra-data.d/50-ilo-firmware

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/ilo/ramdisk-install.d/50-ilo-firmware

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/install-static/install.d/10-install-static-files

@@ -2,7 +2,11 @@
 # Note that this relies on the detail that all elements share one dir inside
 # the chroot. This will copy all the files that elements have added to
 # element/static into the image. Mode, symlinks etc will be respected.
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 STATIC_SOURCE="$(dirname $0)/../static"

elements/ironic-agent/cleanup.d/99-ramdisk-create

@@ -1,8 +1,12 @@
 #!/bin/bash
 
+if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 
+
 [ -n "$TARGET_ROOT" ]
 
 source $_LIB/img-functions

elements/ironic-agent/install.d/60-ironic-agent-install

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/ironic-agent/post-install.d/80-ironic-agent

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ "${DIB_DEBUG_TRACE:-0}" -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/iso/cleanup.d/100-build-iso

@@ -14,7 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 function build_efiboot_img() {

elements/local-config/extra-data.d/62-ssh-key

@@ -2,6 +2,9 @@
 # Save user SSH public key if available.
 # (Obviously not suitable for downloadable images).
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/local-config/install.d/62-ssh-key

@@ -2,6 +2,9 @@
 # Save user SSH public key if available.
 # XXX: Obviously not suitable for downloadable images.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/local-config/pre-install.d/02-proxy-settings

@@ -2,9 +2,11 @@
 # Save the HTTP/[S] and noproxy settings if available.
 # XXX: Obviously not suitable for downloadable images.
 
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
-set -o xtrace
 
 have_apt=
 have_yum=

elements/manifests/cleanup.d/01-copy-manifests-dir

@@ -14,7 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 if [ -d $TMP_MOUNT_PATH/${DIB_MANIFEST_IMAGE_DIR} ]; then

elements/manifests/environment.d/14-manifests

@@ -14,6 +14,10 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
+
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/manifests/extra-data.d/20-manifest-dir

@@ -14,7 +14,11 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 #
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 sudo mkdir -p $TMP_MOUNT_PATH/${DIB_MANIFEST_IMAGE_DIR}

elements/mellanox/install.d/65-mellanox

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Ensure we load the mellanox driver somehow
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/modprobe-blacklist/install.d/80-modprobe-blacklist

@@ -1,5 +1,9 @@
 #!/bin/bash
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 MODULES_LIST=${DIB_MODPROBE_BLACKLIST:?"Please set DIB_MODPROBE_BLACKLIST."}

elements/opensuse/bin/install-packages

@@ -14,6 +14,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/opensuse/extra-data.d/01-inject-defaults

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 export OPENSUSE_EXTRAS_PATH="$TMP_MOUNT_PATH/tmp/opensuse-extras"

elements/opensuse/install.d/01-ccache-symlinks

@@ -1,4 +1,8 @@
 #!/bin/bash
+
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/opensuse/install.d/01-login-defs

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/opensuse/post-install.d/10-mkinitrd

@@ -1,7 +1,10 @@
 #!/bin/bash
 # The base image created by kiwi does not contain an initrd so create one
-# here. 
+# here.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/opensuse/pre-install.d/00-opensuse-setup

@@ -1,6 +1,9 @@
 #!/bin/bash
 # Setup repo required for dkms package.
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/opensuse/pre-install.d/01-opensuse-install-bin

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/opensuse/root.d/10-opensuse-cloud-image

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/package-installs/bin/package-installs

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 SCRIPTNAME=$(basename $0)

elements/package-installs/bin/package-uninstalls

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 SCRIPTNAME=$(basename $0)

elements/package-installs/extra-data.d/99-squash-package-install

@@ -1,5 +1,8 @@
 #!/bin/bash
-set -eux
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 sudo -E $(dirname $0)/../bin/package-installs-squash --elements="$IMAGE_ELEMENT" --path=$ELEMENTS_PATH $TMP_MOUNT_PATH/tmp/package-installs.json

elements/package-installs/install.d/00-package-installs

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 package-installs -d $(dirname $0)

elements/package-installs/install.d/99-package-uninstalls

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 package-uninstalls -d $(dirname $0)

elements/package-installs/post-install.d/00-package-installs

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 package-installs -d $(dirname $0)

elements/package-installs/post-install.d/99-package-uninstalls

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 package-uninstalls -d $(dirname $0)

elements/package-installs/pre-install.d/02-package-installs

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 package-installs -d $(dirname $0)

elements/package-installs/pre-install.d/99-package-uninstalls

@@ -1,6 +1,9 @@
 #!/bin/bash
 
-set -eux
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 package-uninstalls -d $(dirname $0)

elements/pip-cache/root.d/01-pip-cache

@@ -1,5 +1,8 @@
 #!/bin/bash
 
+if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
+    set -x
+fi
 set -eu
 set -o pipefail
 

elements/pkg-map/extra-data.d/10-create-pkg-map-dir

@@ -1,5 +1,9 @@
 #!/bin/bash
-set -eux
+
+if [ ${DIB_DEBUG_TRACE:-1} -gt 0 ]; then
+    set -x
+fi
+set -eu
 set -o pipefail
 
 sudo mkdir -p $TMP_MOUNT_PATH/usr/share/pkg-map/