diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-20 22:31:21 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-20 22:31:21 -0400 |
| commit | 16751f75a51814e4873199eddec15040dd221561 (patch) | |
| tree | 32665c4e809c6a2b6e8c4a567ba77f03edd4bbd7 | |
| parent | 5d1d36f617f9ce342930a78183a13877b5a619cd (diff) | |
| download | vyos-cloud-init-16751f75a51814e4873199eddec15040dd221561.tar.gz vyos-cloud-init-16751f75a51814e4873199eddec15040dd221561.zip | |
fix creation of network-config-ready and dont bother waiting on lo
| -rw-r--r-- | systemd/cloud-init-local.service | 4 | ||||
| -rwxr-xr-x | udev/cloud-init-wait | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index f3a92e2f..dd737644 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -10,9 +10,7 @@ Before=shutdown.target [Service] Type=oneshot ExecStart=/usr/bin/cloud-init init --local -## FIXME: remove this when cloud-initn local does it itself -## or otherwise better signals any blocking udev events -ExecStopPost=touch /run/cloud-init/network-config-ready +ExecStart=/bin/touch /run/cloud-init/network-config-ready RemainAfterExit=yes TimeoutSec=0 diff --git a/udev/cloud-init-wait b/udev/cloud-init-wait index f27309e3..7d53dee4 100755 --- a/udev/cloud-init-wait +++ b/udev/cloud-init-wait @@ -52,6 +52,10 @@ main() { return 0 fi + if [ "${INTERFACE#lo}" != "$INTERFACE" ]; then + return 0 + fi + block_until_ready "$readyfile" .1 600 || { log "failed waiting for ready on $INTERFACE"; return 1; } |