diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-10 10:32:08 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-10 10:32:08 -0500 |
| commit | 2eb86ca13cb658b51440bb28cab47205b641d0ee (patch) | |
| tree | 02fd6a8cfbf51b598c12e70370a5f662f02949a3 | |
| parent | 93e553d64baf6f7e9b135b86f822c4af8bd192d0 (diff) | |
| download | vyos-cloud-init-2eb86ca13cb658b51440bb28cab47205b641d0ee.tar.gz vyos-cloud-init-2eb86ca13cb658b51440bb28cab47205b641d0ee.zip | |
initial systemd service suggestions provided by pitti
This should mean that cloud-init-local is running earlier now
(DefaultDependencies=no). And also blocking networking coming up
(Before=network-pre.target)
cloud-init.service should now actually block network-online.target
from being made (meaning it will run before anything that expects
that) but after networking.service, which is what actually does
the bringup on ifupdown / ubuntu.
| -rw-r--r-- | systemd/cloud-init-local.service | 4 | ||||
| -rw-r--r-- | systemd/cloud-init.service | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service index 73aa46f6..475a2e11 100644 --- a/systemd/cloud-init-local.service +++ b/systemd/cloud-init-local.service @@ -1,7 +1,11 @@ [Unit] Description=Initial cloud-init job (pre-networking) +DefaultDependencies=no Wants=local-fs.target After=local-fs.target +Conflicts=shutdown.target +Before=network-pre.target +Before=shutdown.target [Service] Type=oneshot diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service index 1f656f7f..6fb655e6 100644 --- a/systemd/cloud-init.service +++ b/systemd/cloud-init.service @@ -1,8 +1,8 @@ [Unit] Description=Initial cloud-init job (metadata service crawler) -After=local-fs.target network-online.target cloud-init-local.service -Before=sshd.service sshd-keygen.service systemd-user-sessions.service -Requires=network-online.target +After=cloud-init-local.service networking.service +Before=network-online.target sshd.service sshd-keygen.service systemd-user-sessions.service +Requires=networking.service Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service [Service] |