summaryrefslogtreecommitdiff
path: root/upstart/cloud-init.conf
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2010-03-02 15:05:34 -0500
committerScott Moser <smoser@ubuntu.com>2010-03-02 15:05:34 -0500
commitc2b00684c225433a36898fb895af01608e1af3cc (patch)
tree2c5f9e4bac97618d6d140b1db14ff1c13bfe5d88 /upstart/cloud-init.conf
parent86ea121cedea00091add461219c902aa344fdc4f (diff)
downloadvyos-cloud-init-c2b00684c225433a36898fb895af01608e1af3cc.tar.gz
vyos-cloud-init-c2b00684c225433a36898fb895af01608e1af3cc.zip
update upstart/* files to be in sync with 0.5.7-0ubuntu4
Some changes were rushed in prior to lucid beta that didn't get pulled back into the upstream release. I'm pulling those in here.
Diffstat (limited to 'upstart/cloud-init.conf')
-rw-r--r--upstart/cloud-init.conf7
1 files changed, 3 insertions, 4 deletions
diff --git a/upstart/cloud-init.conf b/upstart/cloud-init.conf
index 56a3545a..2a066105 100644
--- a/upstart/cloud-init.conf
+++ b/upstart/cloud-init.conf
@@ -1,7 +1,6 @@
-#start on (mounted MOUNTPOINT=/ and net-device-up IFACE=eth0)
-# the above start-on never occurs, blocking boot. [bug 504883]
-# instead, start much later in the boot process. sigh..
-start on (local-filesystems and net-device-up IFACE=eth0)
+# cloud-init - the initial cloud-init job
+# crawls metadata service, emits cloud-config
+start on (mounted MOUNTPOINT=/ and net-device-up IFACE=eth0)
task