diff options
| author | Scott Moser <smoser@ubuntu.com> | 2016-03-14 09:52:39 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2016-03-14 09:52:39 -0400 |
| commit | 8a929e66f2fe2aaed968ec23aeaf6d3b3c68cb65 (patch) | |
| tree | 029dfc2c891a151cca226cde76989feb2dd08f79 /systemd/cloud-init.service | |
| parent | 97f81cbecf39c340b6c000d62536fcb7f1ef87b0 (diff) | |
| parent | b1d9c92f5bc6f711e104ceb981ded658249c3255 (diff) | |
| download | vyos-cloud-init-8a929e66f2fe2aaed968ec23aeaf6d3b3c68cb65.tar.gz vyos-cloud-init-8a929e66f2fe2aaed968ec23aeaf6d3b3c68cb65.zip | |
some systemd cleanups
generator:
* write to directory /run/cloud-init/ rather than /run
* read from /proc/1/cmdline for the command line if inside a container
cloud-init-local.service: now run fully before any networking comes up.
cloud-init.service: run before network-online.target and after
networking.service. This ends up meaning other things that require
network-online.target will run after cloud-init.service, but
cloud-init.service will still have networking.
The 'networking.service' is ifupdown specific. Further changes would
be needed for other networking systems (networkd for example)
Diffstat (limited to 'systemd/cloud-init.service')
| -rw-r--r-- | systemd/cloud-init.service | 6 |
1 files changed, 3 insertions, 3 deletions
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] |