From bd42e16c4ce6e785e332d423c92fe736452813f4 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Thu, 1 Sep 2011 20:27:19 -0400 Subject: cloud-init-nonet.conf: just allow for the possibility that /var/run != /run This should not happen any time in the near future, but /var/run is actually legacy, so accept that it might not be there. --- upstart/cloud-init-nonet.conf | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'upstart') diff --git a/upstart/cloud-init-nonet.conf b/upstart/cloud-init-nonet.conf index 01916354..70c7dfea 100644 --- a/upstart/cloud-init-nonet.conf +++ b/upstart/cloud-init-nonet.conf @@ -10,10 +10,11 @@ task console output script - # /var/run/network/static-network-up-emitted is written by - # /etc/network/if-up.d/upstart its presense would indicate - # that static-network-up has already fired. - [ -e /var/run/network/static-network-up-emitted ] && exit 0 + # /run/network/static-network-up-emitted is written by + # upstart (via /etc/network/if-up.d/upstart). its presense would + # indicate that static-network-up has already fired. + EMITTED="/run/network/static-network-up-emitted" + [ -e "$EMITTED" -o -e "/var/$EMITTED" ] && exit 0 [ -f /var/lib/cloud/instance/obj.pkl ] && exit 0 -- cgit v1.2.3