summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog1
-rw-r--r--upstart/cloud-init-nonet.conf2
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index c5d3f79e..6f4b0afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@
(LP: #785542)
- read /etc/ssh/sshd_config for AuthorizedKeysFile rather than
assuming ~/.ssh/authorized_keys (LP: #731849)
+ - fix cloud-init in ubuntu lxc containers (LP: #800824)
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 12f21320..60f83a32 100644
--- a/upstart/cloud-init-nonet.conf
+++ b/upstart/cloud-init-nonet.conf
@@ -14,6 +14,8 @@ script
[ -f /var/lib/cloud/instance/obj.pkl ] && exit 0
+ start networking
+
short=10; long=60;
sleep ${short}
echo $UPSTART_JOB "waiting ${long} seconds for a network device."