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

#!/bin/bash
# Save user SSH public key if available.
# XXX: Obviously not suitable for downloadable images.

if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then
    set -x
fi
set -eu
set -o pipefail

if [ -e "/tmp/in_target.d/ssh-authorized-keys" ]; then
    mkdir -p /root/.ssh
    cat /tmp/in_target.d/ssh-authorized-keys >> /root/.ssh/authorized_keys
    chmod 0700 /root/.ssh
    chmod 0600 /root/.ssh/authorized_keys
fi
Bring across disk image code. 2012-11-09 11:04:13 +00:00			`#!/bin/bash`
			`# Save user SSH public key if available.`
			`# XXX: Obviously not suitable for downloadable images.`

Standarise tracing for scripts 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 2014-09-04 04:56:29 +00:00			`if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then`
			`set -x`
			`fi`
set -u and -o pipefail everywhere As with the previous similar changes, this is intended to catch problems as they happen instead of ignoring them and continuing on to potentially fail later. Setting this on all existing scripts will allow us to enforce use via Jenkins. Change-Id: Iad2d490c86dceab148ea9ab08f457c49a5d5352e 2014-04-03 02:24:15 +00:00			`set -eu`
			`set -o pipefail`
Bring across disk image code. 2012-11-09 11:04:13 +00:00
			`if [ -e "/tmp/in_target.d/ssh-authorized-keys" ]; then`
4 spaces indent ensure 4 spaces indentation is used everywhere. Change-Id: Ieb48faacb4c96b7b358771d70c17f2f22d0354f4 2014-05-02 17:02:38 +00:00			`mkdir -p /root/.ssh`
			`cat /tmp/in_target.d/ssh-authorized-keys >> /root/.ssh/authorized_keys`
			`chmod 0700 /root/.ssh`
			`chmod 0600 /root/.ssh/authorized_keys`
Bring across disk image code. 2012-11-09 11:04:13 +00:00			`fi`