Merge "set -u and -o pipefail everywhere"

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

@@ -2,6 +2,7 @@
 # Override the default /etc/apt/apt.conf with $DIB_APT_CONF
 
 set -ue
+set -o pipefail
 
 # exit directly if DIB_APT_CONF is not defined properly
 if [ -z "${DIB_APT_CONF:-}" ] ; then

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

@@ -1,7 +1,8 @@
 #!/bin/bash
 # Override the default /etc/apt/sources.list with $DIB_APT_SOURCES
 
-set -e
+set -eu
+set -o pipefail
 
 # exit directly if DIB_APT_SOURCES is not defined properly
 if [ -z "$DIB_APT_SOURCES" ] ; then

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

@@ -14,7 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -eu
+set -o pipefail
 
 [ -n "$TARGET_ROOT" ]
 

elements/base/cleanup.d/01-ccache

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 # As this is run in cleanup, it's already been automatically unmounted,
 # so all we need to do here is remove the directory

elements/base/dib-first-boot

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -e
+set -eu
+set -o pipefail
 set -o xtrace
 
 touch /var/log/first-boot.d.log

elements/base/dib-init-system

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 if [ -f /sbin/initctl ]; then
     echo "upstart"

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

@@ -1,7 +1,9 @@
 #!/bin/bash
 # Store the build-time environment and command line arguments
 
-set -e
+set -eu
+set -o pipefail
+
 source $_LIB/die
 [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set"
 

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

@@ -15,6 +15,7 @@
 
 
 set -eux
+set -o pipefail
 
 declare -a SPECIFIED_ELEMS
 

elements/base/finalise.d/01-install-dib-first-boot

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -e
+set -eu
+set -o pipefail
 
 if [ -d /etc/first-boot.d ]; then
     install -m 0755 -o root -g root $(dirname $0)/../dib-first-boot /usr/sbin/

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 # These are useful, or at worst not harmful, for all images we build.
 
-set -e
+set -eu
+set -o pipefail
 
 install-packages vlan open-iscsi

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

@@ -1,7 +1,8 @@
 #!/bin/bash
 # Tweak the stock ubuntu cloud-init config
 
-set -e
+set -eu
+set -o pipefail
 
 dd of=/etc/cloud/cloud.cfg.d/10_etc_hosts.cfg << EOF
 manage_etc_hosts: True

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

@@ -1,7 +1,8 @@
 #!/bin/bash
 # Store build-time environment and command line arguments
 
-set -e
+set -eu
+set -o pipefail
 
 if [ -e "/tmp/in_target.d/dib_environment" ]; then
   cp /tmp/in_target.d/dib_environment /etc/

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

@@ -1,7 +1,8 @@
 #!/bin/bash
 # Install baseline packages and tools.
 
-set -e
+set -eu
+set -o pipefail
 
 # If lsb_release is missing, just do nothing.
 DISTRO=`lsb_release -si` || true

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

@@ -1,5 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 install -m 0755 -o root -g root $(dirname $0)/../dib-init-system /usr/bin/

elements/base/root.d/01-ccache

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 # Don't do anything if already mounted (if disk-image-create is invoked with
 # no elements specified, this hook actually fires twice, once during

elements/cache-url/bin/cache-url

@@ -15,7 +15,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -eu
+set -o pipefail
 
 # Download a URL to a local cache
 # e.g. cache-url http://.../foo ~/.cache/image-create/foo

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

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eux
+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,7 @@
 #!/bin/bash
 set -eux
+set -o pipefail
+
 cat > ${TARGET_ROOT}/.extra_settings << EOF
 DIB_DEBIAN_ALT_INIT_PACKAGE=upstart
 EOF

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

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eux
+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/root.d/08-debootstrap

@@ -15,6 +15,7 @@
 # under the License.
 #
 set -eu
+set -o pipefail
 if [ -f ${TARGET_ROOT}/.extra_settings ] ; then
     . ${TARGET_ROOT}/.extra_settings
 fi

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 INTERFACE=${1:-} #optional, if not specified configure all available interfaces
 ENI_FILE="/etc/network/interfaces"
@@ -68,7 +69,7 @@ function config_exists() {
             return 0
         fi
     else
-        ifquery $interface >/dev/null 2>&1 && return 0
+        ifquery $interface >/dev/null 2>&1 && return 0 || return 1
     fi
     return 1
 }

elements/dib-run-parts/bin/dib-run-parts

@@ -19,6 +19,7 @@ allowed_regex=${RUN_PARTS_REGEX:-"^[0-9A-Za-z_-]+$"}
 show_list=
 
 set -ue
+set -o pipefail
 
 name=$(basename $0)
 

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

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 set -o pipefail
 
 home=$(dirname $0)

elements/dpkg/bin/install-packages

@@ -14,7 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -eu
+set -o pipefail
 
 # install-packages package [package ...]
 

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 [ -n "$TARGET_ROOT" ]
 

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 [ -n "$TARGET_ROOT" ]
 

elements/dpkg/post-install.d/99-clean-up-cache

@@ -1,6 +1,7 @@
 #!/bin/bash
 # Do an apt-get clean. This will free some space.
 
-set -e
+set -eu
+set -o pipefail
 
 apt-get clean

elements/dpkg/post-install.d/99-write-dpkg-manifest

@@ -15,6 +15,7 @@
 # under the License.
 #
 set -eux
+set -o pipefail
 
 DPKG_MANIFEST_NAME=dib-manifest-dpkg-$(basename ${IMAGE_NAME})
 

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 # Do an apt-get update, so that packages can be installed.
 
-set -e
+set -eu
+set -o pipefail
 
 apt-get -y update

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 [ -n "$TARGET_ROOT" ]
 

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 [ -n "$TARGET_ROOT" ]
 

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 [ -n "$TARGET_ROOT" ]
 

elements/dracut-network/install.d/10-install-dracut-network

@@ -1,5 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 install-packages dracut-network patch

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 [ -n "$ARCH" ]
 [ -n "$TARGET_ROOT" ]

elements/hwdiscovery/install.d/10-hwinfo

@@ -1,7 +1,8 @@
 #!/bin/bash
 # Support for hard ware discovery
 
-set -e
+set -eu
+set -o pipefail
 set -o xtrace
 
 install-packages hwinfo

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

@@ -2,7 +2,9 @@
 # Save user SSH public key if available.
 # (Obviously not suitable for downloadable images).
 
-set -e
+set -eu
+set -o pipefail
+
 source $_LIB/die
 [ -n "$TMP_HOOKS_PATH" ] || die "Temp hook path not set"
 

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

@@ -2,7 +2,8 @@
 # Save user SSH public key if available.
 # XXX: Obviously not suitable for downloadable images.
 
-set -e
+set -eu
+set -o pipefail
 
 if [ -e "/tmp/in_target.d/ssh-authorized-keys" ]; then
   mkdir -p /root/.ssh

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

@@ -2,7 +2,8 @@
 # Save the HTTP/[S] and noproxy settings if available.
 # XXX: Obviously not suitable for downloadable images.
 
-set -e
+set -eu
+set -o pipefail
 set -o xtrace
 
 have_apt=

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

@@ -15,6 +15,7 @@
 # under the License.
 #
 set -eux
+set -o pipefail
 
 if [ -d $TMP_MOUNT_PATH/${DIB_MANIFEST_IMAGE_DIR} ]; then
     # Move the dib_environment and dib_arguments files into the manifests dir

elements/manifests/environment.d/15-manifests

@@ -15,6 +15,7 @@
 # under the License.
 #
 set -eu
+set -o pipefail
 
 export DIB_MANIFEST_IMAGE_DIR=${DIB_MANIFEST_IMAGE_DIR:-/etc/dib-manifests}
 export DIB_MANIFEST_SAVE_DIR=${DIB_MANIFEST_SAVE_DIR:-${IMAGE_NAME}.d/}

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

@@ -15,5 +15,6 @@
 # under the License.
 #
 set -eux
+set -o pipefail
 
 sudo mkdir -p $TMP_MOUNT_PATH/${DIB_MANIFEST_IMAGE_DIR}

elements/mellanox/install.d/65-mellanox

@@ -1,7 +1,8 @@
 #!/bin/bash
 # Ensure we load the mellanox driver somehow
 
-set -e
+set -eu
+set -o pipefail
 
 home=$(dirname $0)
 

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

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -ex
+set -eux
+set -o pipefail
 
 MODULES_LIST=${DIB_MODPROBE_BLACKLIST:?"Please set DIB_MODPROBE_BLACKLIST."}
 

elements/opensuse/bin/install-packages

@@ -14,7 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -eu
+set -o pipefail
 
 function run_zypper() {
   # TODO: Uncertain if this can ever block wanting input from user

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-set -e
-set -x
+set -eux
+set -o pipefail
 
 export OPENSUSE_EXTRAS_PATH="$TMP_MOUNT_PATH/tmp/opensuse-extras"
 mkdir -p $OPENSUSE_EXTRAS_PATH

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

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -e
+set -eu
+set -o pipefail
 
 # Setup ccache symlinks, as openSUSE's ccache package doesn't
 # include them.

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

@@ -1,5 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 sed -i -e "s,^USERGROUPS_ENAB.*$,USERGROUPS_ENAB yes," /etc/login.defs

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

@@ -3,6 +3,7 @@
 # here. 
 
 set -eu
+set -o pipefail
 
 # To have access to FS_TYPE
 _LIB="/tmp/opensuse-extras"

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 [ -n "$ARCH" ]
 [ -n "$TARGET_ROOT" ]

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 PIP_CACHE_DIR=$HOME/.cache/image-create/pip
 mkdir -p $PIP_CACHE_DIR

elements/pypi/extra-data.d/00-mount-pypi-mirror

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 PYPI_MIRROR_URL=${PYPI_MIRROR_URL:-''}
 if [ -n "$PYPI_MIRROR_URL" ]; then

elements/pypi/post-install.d/00-unconfigure-pypi-mirror

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 if [ -e ~/.pip/pip.conf.orig ]; then
     mv ~/.pip/pip.conf{.orig,}

elements/ramdisk/cleanup.d/99-extract-ramdisk-files

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-set -e
-set -x
+set -eux
+set -o pipefail
 
 IMAGE_NAME=${IMAGE_NAME:-'image'}
 

elements/ramdisk/extra-data.d/01-inject-ramdisk-build-files

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-set -e
-set -x
+set -eux
+set -o pipefail
 
 export RAMDISK_BUILD_PATH="$TMP_MOUNT_PATH/tmp/ramdisk-build"
 mkdir -p $RAMDISK_BUILD_PATH

elements/ramdisk/install.d/20-install-dhcp-client

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -eux
+set -o pipefail
 
 DISTRO=`lsb_release -si` || true
 

elements/ramdisk/post-install.d/01-ensure-binaries

@@ -1,8 +1,8 @@
 #!/bin/bash
 # Ensure that all binaries listed in ramdisk elements, exist
 
-set -e
-set -x
+set -eux
+set -o pipefail
 
 export TARGET_DIR="/tmp/in_target.d/"
 

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

@@ -1,7 +1,7 @@
 #!/bin/bash
 
-set -e
-set -x
+set -eux
+set -o pipefail
 
 _LIB="/tmp/ramdisk-build"
 

elements/redhat-common/bin/extract-image

@@ -5,6 +5,7 @@
 
 
 set -eu
+set -o pipefail
 
 BASE_IMAGE_FILE=$1
 BASE_IMAGE_TAR=$2

elements/redhat-common/finalise.d/99-cleanup-tmp-grub

@@ -1,5 +1,6 @@
 #!/bin/bash
 
 set -eux
+set -o pipefail
 
 rm -rf /tmp/grub

elements/redhat-common/finalise.d/99-setup-first-boot

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -e
+set -eu
+set -o pipefail
 
 if [ -d /etc/first-boot.d ]; then
     rc_local=/etc/rc.d/rc.local

elements/redhat-common/pre-install.d/02-lsb

@@ -1,5 +1,6 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 install -m 0755 -o root -g root /opt/stack/lsb-release/lsb_release /usr/local/bin

elements/redhat-common/pre-install.d/15-remove-grub

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 yum remove -y grub2
 # Install grub2 dependencies to minimise packages installed during finalise.

elements/rhel/finalise.d/60-rhsm-unregister

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]; then
   if [[ "$DIB_REG_TYPE" == "rhn" ]]; then

elements/rhel/pre-install.d/00-rhsm

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 if [ -n "$DIB_RHSM_USER" ] && [ -n "$DIB_RHSM_PASSWORD" ]
   then

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 [ -n "$ARCH" ]
 [ -n "$TARGET_ROOT" ]

elements/rhel7/root.d/10-rhel-cloud-image

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 [ -n "$ARCH" ]
 [ -n "$TARGET_ROOT" ]

elements/rpm-distro/pre-install.d/01-override-yum-arch

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-set -e
+set -eu
 set -o pipefail
 
 if [ "i386" = "$ARCH" ]; then

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

@@ -1,5 +1,6 @@
 #!/bin/bash
 set -uex
+set -o pipefail
 SCRIPTDIR=$(dirname $0)
 
 DIB_INIT_SYSTEM=$(dib-init-system)

elements/source-repositories/extra-data.d/98-source-repositories

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 # If the old cache exists, move it to the new name
 function make_new_cache(){

elements/source-repositories/install.d/01-source-repositories

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -uex
+set -o pipefail
 
 # Git isn't a dependency of this element, but is a dependency of pbr
 # if you are doing pip install on a git cloned directoy, because this

elements/ubuntu/finalise.d/99-setup-first-boot

@@ -1,5 +1,6 @@
 #!/bin/bash
-set -e
+set -eu
+set -o pipefail
 
 if [ -d /etc/first-boot.d ]; then
     rc_local=/etc/rc.local

elements/ubuntu/install.d/10-support-physical-hardware

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 # Ubuntu's cloud images don't include drivers for real hardware.
 install-packages linux-image-generic

elements/ubuntu/pre-install.d/00-remove-grub

@@ -3,7 +3,8 @@
 # found (as happens in a chroot).
 # Temporarily remove grub, to avoid that confusion.
 
-set -e
+set -eu
+set -o pipefail
 
 if dpkg-query -W grub-pc; then
   apt-get -y remove grub-pc

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

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eu
+set -o pipefail
 
 DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-}
 

elements/ubuntu/root.d/10-cache-ubuntu-tarball

@@ -2,6 +2,7 @@
 # These are useful, or at worst not harmful, for all images we build.
 
 set -eu
+set -o pipefail
 
 [ -n "$ARCH" ]
 [ -n "$TARGET_ROOT" ]

elements/vm/block-device.d/10-partition

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 source $_LIB/die
 [ -n "$IMAGE_BLOCK_DEVICE" ] || die "Image block device not set"
 

elements/vm/finalise.d/50-remove-bogus-udev-links

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -eux
+set -o pipefail
 
 if [ "openSUSE project" = "$(lsb_release -is)" ]; then
     # workaround for https://bugzilla.novell.com/show_bug.cgi?id=859493

elements/vm/finalise.d/51-bootloader

@@ -3,8 +3,8 @@
 # Configure grub. Note that the various conditionals here are to handle
 # different distributions gracefully.
 
-set -e
-set -x
+set -eux
+set -o pipefail
 
 # FIXME:
 [ -n "$IMAGE_BLOCK_DEVICE" ]

elements/yum/bin/install-packages

@@ -14,7 +14,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-set -e
+set -eu
+set -o pipefail
 
 EXTRA_ARGS=
 ACTION=install

elements/yum/pre-install.d/01-yum-keepcache

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 sudo sed -i 's/keepcache=0/keepcache=1/' /etc/yum.conf
 sudo sed -i 's/cachedir=\/var\/cache\/yum/cachedir=\/tmp\/yum/' /etc/yum.conf

elements/yum/root.d/50-yum-cache

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 [ -n "$TARGET_ROOT" ]
 

elements/zypper/post-install.d/99-zypper-no-keep-packages

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 # Disable caching packages for all repositories
 sudo zypper modifyrepo --all --no-keep-packages

elements/zypper/pre-install.d/01-zypper-keep-packages

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 # Enable caching packages for all repositories
 sudo zypper modifyrepo --all --keep-packages

elements/zypper/root.d/50-zypper-cache

@@ -1,6 +1,7 @@
 #!/bin/bash
 
-set -e
+set -eu
+set -o pipefail
 
 [ -n "$TARGET_ROOT" ]