summaryrefslogtreecommitdiff
path: root/extensions/cloud-init.configure
diff options
context:
space:
mode:
authorPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-05-13 09:51:51 +0000
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2016-05-13 09:51:51 +0000
commita1d5011d51f83f6c13916e34a24565435217b885 (patch)
tree29ddff21d533eaa02b0f10f668981435601801de /extensions/cloud-init.configure
parent5a10111c049228302e37d495c1a32588a7cc41f6 (diff)
parent0e0a329c086d424452eaa0bfa77e573f77e3b930 (diff)
downloadinfrastructure-pedro/openssl101t.tar.gz
Merge remote-tracking branch 'definitions/master'pedro/openssl101t
Change-Id: I3c7b31d2006dafd8b69386cbee41d0d568b348eb
Diffstat (limited to 'extensions/cloud-init.configure')
-rwxr-xr-xextensions/cloud-init.configure8
1 files changed, 7 insertions, 1 deletions
diff --git a/extensions/cloud-init.configure b/extensions/cloud-init.configure
index aa83e0e2..3bcc0909 100755
--- a/extensions/cloud-init.configure
+++ b/extensions/cloud-init.configure
@@ -22,6 +22,12 @@ set -e
ROOT="$1"
+# Write detailed logs to a special log file if set, otherwise everything
+# goes to stdout.
+if [ -z "$MORPH_LOG_FD" ]; then
+ MORPH_LOG_FD=1
+fi
+
##########################################################################
set -e
@@ -56,7 +62,7 @@ for service_name in $cloud_init_services; do
echo "Failed to configure cloud-init."
exit 1
else
- echo Enabling systemd service "$service_name" >"$MORPH_LOG_FD"
+ echo Enabling systemd service "$service_name" >&"$MORPH_LOG_FD"
ln -sf "/$services_folder/$service_name" \
"$ROOT/etc/systemd/system/multi-user.target.wants/$service_name"
fi