diff options
Diffstat (limited to 'upstart')
| -rw-r--r-- | upstart/cloud-config.conf | 2 | ||||
| -rw-r--r-- | upstart/cloud-final.conf | 10 | ||||
| -rw-r--r-- | upstart/cloud-run-user-script.conf | 14 |
3 files changed, 11 insertions, 15 deletions
diff --git a/upstart/cloud-config.conf b/upstart/cloud-config.conf index 6649a99d..5edc58b9 100644 --- a/upstart/cloud-config.conf +++ b/upstart/cloud-config.conf @@ -5,4 +5,4 @@ start on (filesystem and started rsyslog) console output task -exec cloud-init-cfg all +exec cloud-init-cfg all config diff --git a/upstart/cloud-final.conf b/upstart/cloud-final.conf new file mode 100644 index 00000000..a04105a1 --- /dev/null +++ b/upstart/cloud-final.conf @@ -0,0 +1,10 @@ +# cloud-final.conf - run "final" jobs +# this runs around traditional "rc.local" time. +# and after all cloud-config jobs are run +description "execute cloud user/final scripts" + +start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config) +console output +task + +exec cloud-init-cfg all final diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf deleted file mode 100644 index e50006d4..00000000 --- a/upstart/cloud-run-user-script.conf +++ /dev/null @@ -1,14 +0,0 @@ -# cloud-run-user-script - runs user scripts found in user-data, that are -# stored in /var/lib/cloud/scripts by the initial cloudinit upstart job -description "execute cloud user scripts" - -start on (stopped rc RUNLEVEL=[2345] and stopped cloud-config) -console output -task - -script -sdir=/var/lib/cloud/data/scripts -[ -d "$sdir" ] || exit 0 -exec cloud-init-run-module once-per-instance user-scripts execute \ - run-parts --regex '.*' "$sdir" -end script |