From b09b12bc0130b6787bfee0332addd055459b9629 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 12 Sep 2014 13:03:44 -0400 Subject: 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 set /etc/network/interfaces. The changes most likely need to still be done for systemd. LP: #1368861 --- upstart/cloud-init-nonet.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'upstart/cloud-init-nonet.conf') diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf index e8ebee96..40059ad6 100644 --- a/upstart/cloud-init-nonet.conf +++ b/upstart/cloud-init-nonet.conf @@ -58,9 +58,8 @@ 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 + # local-finished comes from cloud-init-local + [ -f /run/cloud-init/local-finished ] && exit 0 dowait 10 dowait 120 -- cgit v1.2.3