From 67bf7722398278e7089098dfd683389ef4e418c5 Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Thu, 13 Sep 2012 14:01:04 -0400
Subject: add cloud-init-container.conf

This changes the way that we avoid cloud-init-nonet hanging in a container.
Previously, under LP: #800824 we tried 'start networking', but that caused
issues described in LP: #1031065.

Here, we emit the net-device-added for any devices that have not yet been
seen.

LP: #1031065
---
 upstart/cloud-init-nonet.conf | 2 --
 1 file changed, 2 deletions(-)

(limited to 'upstart/cloud-init-nonet.conf')

diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf
index 7b69e584..118ffc1c 100644
--- a/upstart/cloud-init-nonet.conf
+++ b/upstart/cloud-init-nonet.conf
@@ -18,8 +18,6 @@ script
 
    [ -f /var/lib/cloud/instance/obj.pkl ] && exit 0
 
-   start networking >/dev/null
-
    short=10; long=120;
    sleep ${short}
    echo $UPSTART_JOB "waiting ${long} seconds for a network device."
-- 
cgit v1.2.3