diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-18 20:40:54 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-18 20:40:54 -0400 |
| commit | 519c0936e3e80fc14225e500fbb61d0d12d28c35 (patch) | |
| tree | c3aaf80acaf6f9208b529d84978f23de1210c071 /systemd/cloud-init-generator | |
| parent | 72b56d0f59f321519f25b039937a24b0ce338295 (diff) | |
| download | vyos-cloud-init-519c0936e3e80fc14225e500fbb61d0d12d28c35.tar.gz vyos-cloud-init-519c0936e3e80fc14225e500fbb61d0d12d28c35.zip | |
commit the systemd waiting mechanism
Note, still broken as cloud-init local is not going to ever touch the
CI_NET_READY file (/run/cloud-init/network-config-ready).
So as this is , it will actually just block for 60 seconds and go on.
Diffstat (limited to 'systemd/cloud-init-generator')
| -rwxr-xr-x | systemd/cloud-init-generator | 3 |
1 files changed, 3 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 |