From fb0150dd71bf54bd46e30efab62dbb2f6eca2ba2 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Mon, 1 Aug 2011 14:32:59 -0400 Subject: avoid a race condition if there were multiple networking devices LP: #810044 --- ChangeLog | 2 ++ upstart/cloud-init-nonet.conf | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3