summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog2
-rw-r--r--upstart/cloud-init-nonet.conf2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 681e852e..231ba1b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,8 @@
- support 'include-once' so that expiring or one-time use urls can
be used for '#include' to provide sensitive data.
- support for passing public and private keys to mcollective via cloud-config
+ - support multiple staticly configured network devices, as long as
+ all of them come up early (LP: #810044)
0.6.1:
- fix bug in fixing permission on /var/log/cloud-init.log (LP: #704509)
- improve comment strings in rsyslog file tools/21-cloudinit.conf
diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf
index 60f83a32..9a47b105 100644
--- a/upstart/cloud-init-nonet.conf
+++ b/upstart/cloud-init-nonet.conf
@@ -3,7 +3,7 @@
# * to block running of cloud-init until a non 'lo' interface is up
# * timeout if one doens't come up in a reasonable amount of time
start on mounted MOUNTPOINT=/ and stopped cloud-init-local
-stop on net-device-up IFACE!=lo
+stop on static-network-up
task
console output