diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-04-09 11:54:01 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-04-09 11:54:01 -0400 |
| commit | f4789639af50ea631cf75af526ad013b05670caa (patch) | |
| tree | a260c0bf1a988ee94418d5f7587c9c660aa3c9ea | |
| parent | 8165000c3975db07cb5b8b29410635dd6c9345bd (diff) | |
| download | vyos-cloud-init-f4789639af50ea631cf75af526ad013b05670caa.tar.gz vyos-cloud-init-f4789639af50ea631cf75af526ad013b05670caa.zip | |
systemd: use network-online instead of network.target (LP: #1440180)
don't declare a Wants/Requires on network.target; this is a passive target
that should only be pulled in by implementors of the networking service.
The requirement for network needs to be expressed as a dependency on
network-online.target.
LP: #1440180
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | systemd/cloud-config.service | 4 | ||||
| -rw-r--r-- | systemd/cloud-final.service | 4 | ||||
| -rw-r--r-- | systemd/cloud-init.service | 4 |
4 files changed, 8 insertions, 6 deletions
@@ -30,6 +30,8 @@ - SmartOS: use v2 metadata service (LP: #1436417) [Daniel Watkins] - NoCloud: fix local datasource claiming found without explicit dsmode - Snappy: add support for installing snappy packages and configuring. + - systemd: use network-online instead of network.target (LP: #1440180) + [Steve Langasek] 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service index ac25c776..f9f1996e 100644 --- a/systemd/cloud-config.service +++ b/systemd/cloud-config.service @@ -1,7 +1,7 @@ [Unit] Description=Apply the settings specified in cloud-config -After=network.target cloud-config.target syslog.target -Wants=network.target cloud-config.target +After=network-online.target cloud-config.target syslog.target +Wants=network-online.target cloud-config.target [Service] Type=oneshot diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service index bbcdf30b..c023ad94 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -1,7 +1,7 @@ [Unit] Description=Execute cloud user/final scripts -After=network.target cloud-config.service syslog.target rc-local.service -Wants=network.target cloud-config.service +After=network-online.target cloud-config.service syslog.target rc-local.service +Wants=network-online.target cloud-config.service [Service] Type=oneshot diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service index 398b90ea..48920283 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.target cloud-init-local.service +After=local-fs.target network-online.target cloud-init-local.service Before=sshd.service sshd-keygen.service systemd-user-sessions.service -Requires=network.target +Requires=network-online.target Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service [Service] |