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
114 lines
4.9 KiB
Bash
Executable File
114 lines
4.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
|
|
DISTRO_NAME=${DISTRO_NAME:-debian}
|
|
DIB_RELEASE=${DIB_RELEASE:-unstable}
|
|
DIB_DEBIAN_ALT_INIT_PACKAGE=${DIB_DEBIAN_ALT_INIT_PACKAGE:-sysvinit}
|
|
DIB_DEBOOTSTRAP_EXTRA_ARGS=${DIB_DEBOOTSTRAP_EXTRA_ARGS:-}
|
|
DEBOOTSTRAP_TARBALL=$DIB_IMAGE_CACHE/debootstrap-${DISTRO_NAME}-${DIB_DEBIAN_ALT_INIT_PACKAGE}-${DIB_RELEASE}-${ARCH}.tar.gz
|
|
if [ -n "${DIB_DEBIAN_MIRROR:-}" ]; then
|
|
echo "Use of DIB_DEBIAN_MIRROR environment variable to configure mirror is deprecated."
|
|
echo "Please use DIB_DISTRIBUTION_MIRROR instead."
|
|
DIB_DISTRIBUTION_MIRROR=$DIB_DEBIAN_MIRROR
|
|
fi
|
|
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://http.debian.net/debian}
|
|
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
|
|
echo Building new tarball for Debian $DIB_RELEASE ARCH=$ARCH
|
|
ADD_PACKAGES=sudo,adduser,locales,openssh-server,file,less,kbd,curl,rsync,bash-completion,linux-image-amd64
|
|
|
|
KEYRING_OPT=
|
|
if [ -n "${DIB_DEBIAN_KEYRING:-}" ] ; then
|
|
KEYRING_OPT="--keyring=${DIB_DEBIAN_KEYRING}"
|
|
fi
|
|
|
|
sudo sh -c "http_proxy=$http_proxy debootstrap --verbose \
|
|
--arch=${ARCH} \
|
|
--include=${ADD_PACKAGES} \
|
|
$KEYRING_OPT \
|
|
$DIB_DEBOOTSTRAP_EXTRA_ARGS \
|
|
$DIB_RELEASE \
|
|
$TARGET_ROOT \
|
|
$DIB_DISTRIBUTION_MIRROR \
|
|
${DIB_DEBIAN_DEBOOTSTRAP_SCRIPT:-}"
|
|
echo "Customizing result for cloud use"
|
|
|
|
apt_get_bp_extra_opts=
|
|
if [ "$DIB_RELEASE" = "wheezy" ]; then
|
|
sudo sh -c "echo deb $DIB_DISTRIBUTION_MIRROR wheezy-backports main >> ${TARGET_ROOT}/etc/apt/sources.list"
|
|
cat << EOF | sudo tee -a ${TARGET_ROOT}/etc/network/interfaces
|
|
source /etc/network/interfaces.d/*
|
|
EOF
|
|
apt_get_bp_extra_opts="-t wheezy-backports"
|
|
fi
|
|
|
|
# Need to update to retrieve the signed Release file
|
|
sudo sh -c "http_proxy=$http_proxy chroot ${TARGET_ROOT} apt-get update"
|
|
|
|
CLOUD_INIT_PACKAGES="cloud-init cloud-utils cloud-initramfs-growroot"
|
|
sudo sh -c "http_proxy=$http_proxy chroot ${TARGET_ROOT} apt-get install -y $apt_get_bp_extra_opts $CLOUD_INIT_PACKAGES"
|
|
|
|
if [ "$DIB_DEBIAN_ALT_INIT_PACKAGE" != "sysvinit" ]; then
|
|
# To avoid a conflict against an essential package, we need to remove sysvinit first
|
|
sudo chroot ${TARGET_ROOT} dpkg --purge --force remove-essential sysvinit
|
|
sudo sh -c "http_proxy=$http_proxy chroot ${TARGET_ROOT} apt-get install -y $apt_get_bp_extra_opts $DIB_DEBIAN_ALT_INIT_PACKAGE"
|
|
sudo sh -c "printf \"Package: sysvinit\nPin: origin ""\nPin-Priority: -1\n\" > \
|
|
${TARGET_ROOT}/etc/apt/preferences.d/sysvinit > ${TARGET_ROOT}/etc/apt/preferences.d/sysvinit"
|
|
fi
|
|
|
|
sudo sed -i "s/PermitRootLogin yes/PermitRootLogin without-password/" $TARGET_ROOT/etc/ssh/sshd_config
|
|
sudo chroot ${TARGET_ROOT} adduser --gecos Debian-cloud-init-user --disabled-password --quiet debian
|
|
sudo install -d -m 0755 -o root -g root ${TARGET_ROOT}/etc/sudoers.d
|
|
sudo sh -c "echo 'debian ALL=(ALL) NOPASSWD:ALL' > ${TARGET_ROOT}/etc/sudoers.d/debian-cloud-init"
|
|
sudo chmod 0440 ${TARGET_ROOT}/etc/sudoers.d/debian-cloud-init
|
|
sudo sh -c "echo \"proc /proc proc nodev,noexec,nosuid 0 0
|
|
LABEL=${DIB_ROOT_LABEL} / ext4 errors=remount-ro 0 1
|
|
\" > ${TARGET_ROOT}/etc/fstab"
|
|
sudo sh -c "echo 'blacklist pcspkr' > ${TARGET_ROOT}/etc/modprobe.d/blacklist.conf"
|
|
sudo sh -c "echo 'debian' > ${TARGET_ROOT}/etc/hostname"
|
|
|
|
# specify a hostname so that cloud-init does not default to (None)
|
|
sudo sh -c "echo 'hostname: debian' > ${TARGET_ROOT}/etc/cloud/cloud.cfg.d/01_hostname.cfg"
|
|
|
|
# cloud images expect eth0 to use dhcp.
|
|
sudo mkdir -p ${TARGET_ROOT}/etc/network/interfaces.d
|
|
cat << EOF | sudo tee ${TARGET_ROOT}/etc/network/interfaces.d/eth0
|
|
# The primary network interface
|
|
auto eth0
|
|
iface eth0 inet dhcp
|
|
EOF
|
|
|
|
echo Caching debootstrap result in $DEBOOTSTRAP_TARBALL
|
|
sudo tar -C $TARGET_ROOT -zcf $DEBOOTSTRAP_TARBALL --exclude='./tmp/*' .
|
|
fi
|
|
|
|
sudo rm -f ${TARGET_ROOT}/.extra_settings
|