diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-09-13 14:01:04 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-09-13 14:01:04 -0400 |
| commit | 67bf7722398278e7089098dfd683389ef4e418c5 (patch) | |
| tree | 054f5e096817580aea89ada5cc3c9bbf88f11035 /upstart/cloud-init-nonet.conf | |
| parent | 75bec162045856b39b483d11a0b3a7a75886efd2 (diff) | |
| download | vyos-cloud-init-67bf7722398278e7089098dfd683389ef4e418c5.tar.gz vyos-cloud-init-67bf7722398278e7089098dfd683389ef4e418c5.zip | |
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
Diffstat (limited to 'upstart/cloud-init-nonet.conf')
| -rw-r--r-- | upstart/cloud-init-nonet.conf | 2 |
1 files changed, 0 insertions, 2 deletions
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." |