diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-23 11:00:37 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-23 11:00:37 -0400 |
| commit | d32116c3468e5c394b56d078ceef86d416d83b3a (patch) | |
| tree | 6c92d8bc5edfd9726106946bd57e9c8acc26f86a /systemd | |
| parent | 6082a5b0c2b1a52ddbf63bfd80331f28f8cdc4fa (diff) | |
| parent | 5b3cad36be8981cd12cffdf5c5e539b522404000 (diff) | |
| download | vyos-cloud-init-d32116c3468e5c394b56d078ceef86d416d83b3a.tar.gz vyos-cloud-init-d32116c3468e5c394b56d078ceef86d416d83b3a.zip | |
merge from trunk.net1
Diffstat (limited to 'systemd')
| -rwxr-xr-x | systemd/cloud-init-generator | 3 | ||||
| -rw-r--r-- | systemd/cloud-init-local.service | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/systemd/cloud-init-generator b/systemd/cloud-init-generator index 2d319695..ae286d58 100755 --- a/systemd/cloud-init-generator +++ b/systemd/cloud-init-generator @@ -107,6 +107,9 @@ main() { "ln $CLOUD_SYSTEM_TARGET $link_path" fi fi + # this touches /run/cloud-init/enabled, which is read by + # udev/cloud-init-wait. If not present, it will exit quickly. + touch "$LOG_D/$ENABLE" elif [ "$result" = "$DISABLE" ]; then if [ -f "$link_path" ]; then if rm -f "$link_path"; then diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index 475a2e11..b19eeaee 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -2,6 +2,7 @@ Description=Initial cloud-init job (pre-networking) DefaultDependencies=no Wants=local-fs.target +Wants=network-pre.target After=local-fs.target Conflicts=shutdown.target Before=network-pre.target @@ -10,6 +11,7 @@ Before=shutdown.target [Service] Type=oneshot ExecStart=/usr/bin/cloud-init init --local +ExecStart=/bin/touch /run/cloud-init/network-config-ready RemainAfterExit=yes TimeoutSec=0 |