summaryrefslogtreecommitdiff
path: root/upstart/cloud-init-nonet.conf
diff options
context:
space:
mode:
authorScott Moser <smoser@ubuntu.com>2014-09-12 17:48:27 -0400
committerScott Moser <smoser@ubuntu.com>2014-09-12 17:48:27 -0400
commit32be9ac3d7dc2a2361bccaafbc8f7b8636d564a7 (patch)
treedf77849a25ed4735aeab1104e9c782e8dadbd5b3 /upstart/cloud-init-nonet.conf
parent78dd5e2783dbf06c0e2d6569423d1bbb24dcfa89 (diff)
parent41a52ef99a9dddd3fef9bdc883dfca55770ef2a5 (diff)
downloadvyos-cloud-init-32be9ac3d7dc2a2361bccaafbc8f7b8636d564a7.tar.gz
vyos-cloud-init-32be9ac3d7dc2a2361bccaafbc8f7b8636d564a7.zip
upstart: add blocknet which blocks net until after cloud-init-local
This makes it so networking wont start to come up until after cloud-init-local has had a chance to search local datasources and write /etc/network/interfaces. The changes most likely need to still be done for systemd. LP: #1368861
Diffstat (limited to 'upstart/cloud-init-nonet.conf')
-rw-r--r--upstart/cloud-init-nonet.conf4
1 files changed, 0 insertions, 4 deletions
diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf
index e8ebee96..38630b39 100644
--- a/upstart/cloud-init-nonet.conf
+++ b/upstart/cloud-init-nonet.conf
@@ -58,10 +58,6 @@ script
# static_network_up already occurred
static_network_up && exit 0
- # obj.pkl comes from cloud-init-local (or previous boot and
- # manual_cache_clean)
- [ -f /var/lib/cloud/instance/obj.pkl ] && exit 0
-
dowait 10
dowait 120
msg "gave up waiting for a network device."