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
86 lines
2.9 KiB
Bash
Executable file
86 lines
2.9 KiB
Bash
Executable file
#!/bin/bash
|
|
#
|
|
# Copyright 2014 Hewlett-Packard Development Company, L.P.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# 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
|
|
|
|
[ -n "$DISTRO_NAME" ]
|
|
[ -n "$DIB_RELEASE" ]
|
|
|
|
DIB_DEBOOTSTRAP_EXTRA_ARGS=${DIB_DEBOOTSTRAP_EXTRA_ARGS:-}
|
|
DEBOOTSTRAP_TARBALL=$DIB_IMAGE_CACHE/debootstrap-${DISTRO_NAME}-${DIB_RELEASE}-${ARCH}.tar.gz
|
|
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://archive.ubuntu.com/ubuntu}
|
|
http_proxy=${http_proxy:-}
|
|
|
|
set -x
|
|
if [ -n "$DIB_OFFLINE" -o -n "${DIB_DEBIAN_USE_DEBOOTSTRAP_CACHE:-}" ] && [ -f $DEBOOTSTRAP_TARBALL ] ; then
|
|
echo $DEBOOTSTRAP_TARBALL found in cache. Using.
|
|
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $DEBOOTSTRAP_TARBALL
|
|
else
|
|
|
|
KEYRING_OPT=
|
|
if [ -n "${DIB_DEBIAN_KEYRING:-}" ] ; then
|
|
KEYRING_OPT="--keyring=${DIB_DEBIAN_KEYRING}"
|
|
fi
|
|
|
|
# Have to --include=python because of dib-run-parts
|
|
# Have to --include=sudo for pre-install.d use of sudoers files
|
|
sudo sh -c "http_proxy=$http_proxy debootstrap --verbose \
|
|
--variant=minbase \
|
|
--include=python,sudo \
|
|
--components=main,restricted,universe \
|
|
--arch=${ARCH} \
|
|
$KEYRING_OPT \
|
|
$DIB_DEBOOTSTRAP_EXTRA_ARGS \
|
|
$DIB_RELEASE \
|
|
$TARGET_ROOT \
|
|
$DIB_DISTRIBUTION_MIRROR \
|
|
${DIB_DEBIAN_DEBOOTSTRAP_SCRIPT:-}"
|
|
|
|
echo "Customizing result for cloud use"
|
|
|
|
sudo install -d -m 0755 -o root -g root ${TARGET_ROOT}/etc/sudoers.d
|
|
|
|
cat << EOF | sudo tee ${TARGET_ROOT}/etc/fstab > /dev/null
|
|
proc /proc proc nodev,noexec,nosuid 0 0
|
|
LABEL=${DIB_ROOT_LABEL} / ext4 errors=remount-ro 0 1
|
|
EOF
|
|
sudo sh -c "echo 'blacklist pcspkr' > ${TARGET_ROOT}/etc/modprobe.d/blacklist.conf"
|
|
|
|
# It would be eversogreat if we didn't need to do crap like this
|
|
sudo sh -c "echo 'ubuntu' > ${TARGET_ROOT}/etc/hostname"
|
|
|
|
# cloud images expect eth0 and eth1 to use dhcp.
|
|
sudo mkdir -p ${TARGET_ROOT}/etc/network/interfaces.d
|
|
for interface in eth0 eth1; do
|
|
cat << EOF | sudo tee ${TARGET_ROOT}/etc/network/interfaces.d/$interface
|
|
auto $interface
|
|
iface $interface inet dhcp
|
|
EOF
|
|
done
|
|
|
|
echo Caching debootstrap result in $DEBOOTSTRAP_TARBALL
|
|
sudo tar --numeric-owner -C $TARGET_ROOT -zcf $DEBOOTSTRAP_TARBALL --exclude='./tmp/*' .
|
|
fi
|
|
|
|
sudo rm -f ${TARGET_ROOT}/.extra_settings
|