summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorScott Moser <smoser@nelson>2010-01-11 12:54:15 -0500
committerScott Moser <smoser@nelson>2010-01-11 12:54:15 -0500
commitcc01225957ef50fd9858424122e50938100bc23b (patch)
treeed7f4f1fe5e3d07f7e2a30cf5ba1d562b5b94a41
parent062080f2fa87878f67d819c88ec1032d262e5555 (diff)
downloadvyos-cloud-init-cc01225957ef50fd9858424122e50938100bc23b.tar.gz
vyos-cloud-init-cc01225957ef50fd9858424122e50938100bc23b.zip
2 changes to cloud-run-user-script
1. arguments to run-parts came before run-parts 2. explicitly state that we dont want this script to run until cloud-config is done
-rw-r--r--upstart/cloud-run-user-script.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf
index e4a60bcb..cf76fe32 100644
--- a/upstart/cloud-run-user-script.conf
+++ b/upstart/cloud-run-user-script.conf
@@ -3,7 +3,7 @@
description "execute cloud user scripts"
-start on stopped rc RUNLEVEL=[2345]
+start on (stopped rc RUNLEVEL=[2345] and cloud-config)
console output
task
@@ -11,5 +11,5 @@ script
sdir=/var/lib/cloud/data/scripts
[ -d "$sdir" ] || exit 0
exec cloud-init-run-module once-per-instance user-scripts execute \
- --regex '.*' run-parts "$sdir"
+ run-parts --regex '.*' "$sdir"
end script