openstack/deb-python-diskimage-builder
Code Issues Proposed changes

Merge "Standarise tracing for scripts"

Browse Source
This commit is contained in:
Jenkins
2015-03-04 00:38:44 +00:00
committed by Gerrit Code Review
parent 226eaa3e3f 36b59c001c
commit cec46c56a4
162 changed files with 570 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
bin/dib-lint
View File

@@ -94,7 +94,8 @@ for i in $(find elements -type f); do
fi fi
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 # NOTE(bnemec): This doesn't verify that the set call occurs high
# enough in the file to be useful, but hopefully nobody will be # 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 # 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" error "$i is not set -o pipefail"
fi fi
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 fi
done done

2
bin/disk-image-create
View File

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

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

@@ -1,7 +1,10 @@
#!/bin/bash #!/bin/bash
# Override the default /etc/apt/apt.conf with $DIB_APT_CONF # 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 set -o pipefail
# exit directly if DIB_APT_CONF is not defined properly # exit directly if DIB_APT_CONF is not defined properly

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

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

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

@@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
# Override the default /etc/apt/sources.list with $DIB_APT_SOURCES # 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 -eu
set -o pipefail set -o pipefail

5
elements/architecture-emulation-binaries/cleanup.d/01-cleanbinary
View File

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

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

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

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

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

3
elements/base/cleanup.d/01-ccache
View File

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

5
elements/base/cleanup.d/99-tidy-logs
View File

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

3
elements/base/dib-init-system
View File

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

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

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

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

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

3
elements/base/install.d/00-baseline-environment
View File

@@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
# These are useful, or at worst not harmful, for all images we build. # 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 -eu
set -o pipefail set -o pipefail

3
elements/base/install.d/10-cloud-init
View File

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

3
elements/base/install.d/50-store-build-settings
View File

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

3
elements/base/install.d/99-dkms
View File

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

3
elements/base/install.d/99-up-to-date
View File

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

3
elements/base/pre-install.d/03-baseline-tools
View File

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

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

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

3
elements/base/root.d/01-ccache
View File

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

3
elements/cache-url/bin/cache-url
View File

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

4
elements/centos-minimal/root.d/08-rinse
View File

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

3
elements/centos7/pre-install.d/01-yum-repos
View File

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

3
elements/centos7/root.d/10-centos7-cloud-image
View File

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

5
elements/cleanup-kernel-initrd/cleanup.d/99-cleanup-kernel-initrd
View File

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

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

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

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

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

7
elements/debian-systemd/root.d/05-debian-systemd
View File

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

6
elements/debian-upstart/root.d/05-debian-upstart
View File

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

7
elements/debian-upstart/root.d/20-debian-fix-upstart-jobs
View File

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

4
elements/debian/bin/map-services
View File

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

5
elements/debian/root.d/08-debootstrap
View File

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

6
elements/dhcp-all-interfaces/install.d/50-dhcp-all-interfaces
View File

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

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

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

3
elements/dhcp-all-interfaces/install.d/dhcp-all-interfaces.sh
View File

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

3
elements/dib-run-parts/root.d/90-base-dib-run-parts
View File

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

3
elements/disable-selinux/post-install.d/15-disable-selinux
View File

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

3
elements/dkms/post-install.d/99-dkms
View File

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

3
elements/dpkg/bin/install-packages
View File

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

3
elements/dpkg/cleanup.d/40-unblock-daemons
View File

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

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

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

3
elements/dpkg/cleanup.d/60-untrim-dpkg
View File

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

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

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

3
elements/dpkg/finalise.d/99-clean-up-cache
View File

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

6
elements/dpkg/finalise.d/99-write-dpkg-manifest
View File

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

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

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

3
elements/dpkg/pre-install.d/01-dpkg-install-bin
View File

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

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

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

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

@@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
# Do an apt-get update, so that packages can be installed. # 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 -eu
set -o pipefail set -o pipefail

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

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

3
elements/dpkg/root.d/60-block-apt-translations
View File

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

3
elements/dpkg/root.d/99-block-daemons
View File

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

3
elements/dpkg/root.d/99-shared_apt_cache
View File

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

3
elements/dpkg/root.d/99-trim-dpkg
View File

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

3
elements/dracut-network/finalise.d/98-regenerate-initramfs
View File

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

3
elements/dracut-network/install.d/11-patch-dracut
View File

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

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

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# NOTE(bnemec): Dracut doesn't like it if we enable these # 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 never let Dracut boot off the specified root anyway, so all
# we need is a value it will accept. # we need is a value it will accept.

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

@@ -1,7 +1,7 @@
#!/bin/bash #!/bin/bash
# Dracut is bash too, and it doesn't play nicely with our usual sets # 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() { check() {
return 0 return 0

5
elements/dracut-ramdisk/install.d/20-install-dracut-deps
View File

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

6
elements/dracut-ramdisk/post-install.d/99-build-dracut-ramdisk
View File

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

5
elements/element-manifest/extra-data.d/75-inject-element-manifest
View File

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

7
elements/enable-serial-console/install.d/20-stty
View File

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

4
elements/epel/pre-install.d/05-rpm-epel-release
View File

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

3
elements/fedora/pre-install.d/01-set-fedora-mirror
View File

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

3
elements/fedora/root.d/10-fedora-cloud-image
View File

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

3
elements/ilo/extra-data.d/50-ilo-firmware
View File

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

3
elements/ilo/ramdisk-install.d/50-ilo-firmware
View File

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

6
elements/install-static/install.d/10-install-static-files
View File

@@ -2,7 +2,11 @@
# Note that this relies on the detail that all elements share one dir inside # 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 # the chroot. This will copy all the files that elements have added to
# element/static into the image. Mode, symlinks etc will be respected. # 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 set -o pipefail
STATIC_SOURCE="$(dirname $0)/../static" STATIC_SOURCE="$(dirname $0)/../static"

4
elements/ironic-agent/cleanup.d/99-ramdisk-create
View File

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

3
elements/ironic-agent/install.d/60-ironic-agent-install
View File

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

3
elements/ironic-agent/post-install.d/80-ironic-agent
View File

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

5
elements/iso/cleanup.d/100-build-iso
View File

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

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

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

3
elements/local-config/install.d/62-ssh-key
View File

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

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

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

6
elements/manifests/cleanup.d/01-copy-manifests-dir
View File

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

4
elements/manifests/environment.d/14-manifests
View File

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

6
elements/manifests/extra-data.d/20-manifest-dir
View File

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

3
elements/mellanox/install.d/65-mellanox
View File

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

6
elements/modprobe-blacklist/install.d/80-modprobe-blacklist
View File

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

3
elements/opensuse/bin/install-packages
View File

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

5
elements/opensuse/extra-data.d/01-inject-defaults
View File

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

4
elements/opensuse/install.d/01-ccache-symlinks
View File

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

3
elements/opensuse/install.d/01-login-defs
View File

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

3
elements/opensuse/post-install.d/10-mkinitrd
View File

@@ -2,6 +2,9 @@
# The base image created by kiwi does not contain an initrd so create one # 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 -eu
set -o pipefail set -o pipefail

3
elements/opensuse/pre-install.d/00-opensuse-setup
View File

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

3
elements/opensuse/pre-install.d/01-opensuse-install-bin
View File

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

3
elements/opensuse/root.d/10-opensuse-cloud-image
View File

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

5
elements/package-installs/bin/package-installs
View File

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

5
elements/package-installs/bin/package-uninstalls
View File

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

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

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

5
elements/package-installs/install.d/00-package-installs
View File

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

5
elements/package-installs/install.d/99-package-uninstalls
View File

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

5
elements/package-installs/post-install.d/00-package-installs
View File

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

5
elements/package-installs/post-install.d/99-package-uninstalls
View File

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

5
elements/package-installs/pre-install.d/02-package-installs
View File

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

5
elements/package-installs/pre-install.d/99-package-uninstalls
View File

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

3
elements/pip-cache/root.d/01-pip-cache
View File

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

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

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

Some files were not shown because too many files have changed in this diff Show More