From 516e378f0e79d127baeac8c6418efc504d3b713e Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 24 Jan 2011 19:51:57 +0000 Subject: move cloud-run-user-script.conf to cloud-final, use cloud-cfg for invoking This moves what was done as cloud-run-user-script.conf to 'cloud-final' and makes that re-use the cloud-init-cfg code, but simply with a different set of default configs. Also, adds keys_to_console and final_message cloud-config modules LP: #653271 --- upstart/cloud-run-user-script.conf | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 upstart/cloud-run-user-script.conf (limited to 'upstart/cloud-run-user-script.conf') diff --git a/upstart/cloud-run-user-script.conf b/upstart/cloud-run-user-script.conf deleted file mode 100644 index e845aa71..00000000 --- a/upstart/cloud-run-user-script.conf +++ /dev/null @@ -1,28 +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 -bd=/var/lib/cloud -toks=" - ${bd}/scripts/per-once:once:cloud-scripts-per-once - ${bd}/scripts/per-boot:always:cloud-scripts-per-boot - ${bd}/scripts/per-instance:once-per-instance:cloud-scripts-per-instance - ${bd}/instance/scripts:once-per-instance:user-scripts -" -oifs=${IFS} -errors="" -for tok in ${toks}; do - IFS=":"; set -- ${tok}; IFS=${oifs} - dir=${1}; per=${2}; name=${3} - [ -d "${dir}" ] || continue - cloud-init-run-module "${per}" "${name}" execute \ - run-parts --regex '.*' "$dir" || errors="${errors} ${name}" -done -errors=${errors# } -[ -z "${errors}" ] || { echo "errors executing ${errors}" 1>&2; exit 1; } -end script -- cgit v1.2.3