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
111 lines
3.8 KiB
Bash
Executable File
111 lines
3.8 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
|
|
# Override global DISTRO_NAME, because centos7 does not work for rinse
|
|
DISTRO_NAME=centos
|
|
DIB_RELEASE=${DIB_RELEASE:-7}
|
|
DIB_RINSE_EXTRA_ARGS=${DIB_RINSE_EXTRA_ARGS:-}
|
|
RINSE_TARBALL=$DIB_IMAGE_CACHE/rinse-${DISTRO_NAME}-${DIB_RELEASE}-${ARCH}.tar.gz
|
|
DIB_DISTRIBUTION_MIRROR=${DIB_DISTRIBUTION_MIRROR:-http://mirror.centos.org/centos/7/os/x86_64/Packages/}
|
|
http_proxy=${http_proxy:-}
|
|
|
|
set -x
|
|
if [ -n "$DIB_OFFLINE" -o -n "${DIB_CENTOS_USE_RINSE_CACHE:-}" ] && [ -f $RINSE_TARBALL ] ; then
|
|
echo $RINSE_TARBALL found in cache. Using.
|
|
sudo tar -C $TARGET_ROOT --numeric-owner -xzf $RINSE_TARBALL
|
|
else
|
|
|
|
sudo sh -c "http_proxy=$http_proxy rinse \
|
|
--mirror $DIB_DISTRIBUTION_MIRROR \
|
|
--pkgs-dir $TMP_HOOKS_PATH/packages \
|
|
--arch $ARCH \
|
|
--distribution $DISTRO_NAME-$DIB_RELEASE \
|
|
--directory $TARGET_ROOT \
|
|
$DIB_RINSE_EXTRA_ARGS"
|
|
|
|
echo "Customizing result for cloud use"
|
|
(
|
|
cd $TARGET_ROOT
|
|
# effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target"
|
|
# locales
|
|
sudo rm -rf usr/{{lib,share}/locale,{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive}
|
|
# docs
|
|
sudo rm -rf usr/share/{man,doc,info,gnome/help}
|
|
# cracklib
|
|
sudo rm -rf usr/share/cracklib
|
|
# i18n
|
|
sudo rm -rf usr/share/i18n
|
|
# yum cache
|
|
sudo rm -rf var/cache/yum
|
|
sudo mkdir -p --mode=0755 var/cache/yum
|
|
# sln
|
|
sudo rm -rf sbin/sln
|
|
# ldconfig
|
|
sudo rm -rf etc/ld.so.cache var/cache/ldconfig
|
|
sudo mkdir -p --mode=0755 var/cache/ldconfig
|
|
|
|
# allow networking init scripts inside the container to work without extra steps
|
|
cat << EOF | sudo tee etc/sysconfig/network > /dev/null
|
|
NETWORKING=yes
|
|
NETWORKING_IPV6=yes
|
|
NOZEROCONF=yes
|
|
EOF
|
|
|
|
for interface in eth0 eth1; do
|
|
cat << EOF | sudo tee etc/sysconfig/network-scripts/ifcfg-$interface > /dev/null
|
|
DEVICE=eth0
|
|
BOOTPROTO=dhcp
|
|
ONBOOT=on
|
|
EOF
|
|
done
|
|
)
|
|
|
|
sudo rm -f $TARGET_ROOT/*rpm
|
|
sudo umount $TARGET_ROOT/proc
|
|
sudo umount $TARGET_ROOT/sys
|
|
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
|
|
|
|
# The filesystem package as shipped is broken. For reasons I don't fully
|
|
# understand, rinse installs files into proper dirs, but subsequent RPM
|
|
# operations expect these locations to be symlinks. If this next block
|
|
# is not executed, yum installs or updates will fail with a cryptic cpio
|
|
# failure. Moving the files in /sbin and /lib64 to /usr/sbin and /usr/lib64
|
|
# and then making symlinks makes rpm happy.
|
|
for broken in lib64 sbin ; do
|
|
sudo cp -a $TARGET_ROOT/$broken/* $TARGET_ROOT/usr/$broken
|
|
sudo rm -rf $TARGET_ROOT/$broken
|
|
sudo ln -s usr/$broken $TARGET_ROOT/$broken
|
|
done
|
|
|
|
echo Caching rinse result in $RINSE_TARBALL
|
|
sudo tar --numeric-owner -C $TARGET_ROOT -zcf $RINSE_TARBALL --exclude='./tmp/*' .
|
|
fi
|
|
|
|
sudo rm -f ${TARGET_ROOT}/.extra_settings
|