diff options
| author | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:40 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-08-23 16:48:40 -0400 |
| commit | 24365490c58df8f0ef2246838c81ec604f0311ac (patch) | |
| tree | 3a6e44277256d15bb215cef3c61799397a673e6e /systemd | |
| parent | f16b906c987c7a7948c9adad8f32c1f786ca6569 (diff) | |
| parent | 18bf614ca1d9fbabdf83495e7675a2cacaf6c2f4 (diff) | |
| download | vyos-cloud-init-24365490c58df8f0ef2246838c81ec604f0311ac.tar.gz vyos-cloud-init-24365490c58df8f0ef2246838c81ec604f0311ac.zip | |
merge trunk at 0.7.7~bzr1189
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 |