diff options
| author | Scott Moser <smoser@brickies.net> | 2016-11-04 13:46:09 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-11-04 13:46:09 -0400 |
| commit | b380e16183446f2e39f47a3c0804d2081714acb2 (patch) | |
| tree | a5e05b4a22553769d6eaa7e5fa93e3401a758b2b /systemd | |
| parent | 882b22e024733e17757fdbe36ba2a3672c6ebe06 (diff) | |
| parent | a1cdebdea65ccd827060c823146992bba9debe19 (diff) | |
| download | vyos-cloud-init-b380e16183446f2e39f47a3c0804d2081714acb2.tar.gz vyos-cloud-init-b380e16183446f2e39f47a3c0804d2081714acb2.zip | |
merge from master at 0.7.8-34-ga1cdebd
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/cloud-init-local.service | 4 | ||||
| -rw-r--r-- | systemd/cloud-init.service | 17 |
2 files changed, 17 insertions, 4 deletions
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index b19eeaee..55834ba4 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -4,9 +4,11 @@ DefaultDependencies=no Wants=local-fs.target Wants=network-pre.target After=local-fs.target -Conflicts=shutdown.target +Before=basic.target +Before=NetworkManager.service 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..5c71b213 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -1,9 +1,20 @@ [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=dbus.socket +Before=network-online.target +Before=sshd-keygen.service +Before=sshd.service +Before=systemd-user-sessions.service +Conflicts=shutdown.target [Service] Type=oneshot |