diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-20 13:58:52 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-20 13:58:52 -0400 |
| commit | 539ad73ee6c4a7d48e5ca4c58b329fcc0216f929 (patch) | |
| tree | 955a9007cc7f62f2983aeb487959d3c7b061ca9f /systemd | |
| parent | b6c724db8ee7fcf5cd2f95aa3909d2108a8f3c10 (diff) | |
| parent | 80f5ec4be0f781b26eca51d90d51abfab396b3f6 (diff) | |
| download | vyos-cloud-init-539ad73ee6c4a7d48e5ca4c58b329fcc0216f929.tar.gz vyos-cloud-init-539ad73ee6c4a7d48e5ca4c58b329fcc0216f929.zip | |
merge from master at 0.7.8-3-g80f5ec4
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/cloud-init-local.service | 3 | ||||
| -rw-r--r-- | systemd/cloud-init.service | 16 |
2 files changed, 15 insertions, 4 deletions
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index b19eeaee..bc2db60e 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -4,9 +4,10 @@ DefaultDependencies=no Wants=local-fs.target Wants=network-pre.target After=local-fs.target -Conflicts=shutdown.target +Before=basic.target Before=network-pre.target Before=shutdown.target +Conflicts=shutdown.target [Service] Type=oneshot diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service index 6fb655e6..1e392a39 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -1,9 +1,19 @@ [Unit] Description=Initial cloud-init job (metadata service crawler) -After=cloud-init-local.service networking.service -Before=network-online.target sshd.service sshd-keygen.service systemd-user-sessions.service +DefaultDependencies=no +Wants=cloud-init-local.service +Wants=local-fs.target +Wants=sshd-keygen.service +Wants=sshd.service +After=cloud-init-local.service +After=networking.service Requires=networking.service -Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service +Before=basic.target +Before=network-online.target +Before=sshd-keygen.service +Before=sshd.service +Before=systemd-user-sessions.service +Conflicts=shutdown.target [Service] Type=oneshot |