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.
This commit is contained in:
Scott Moser 2015-04-09 11:54:01 -04:00
parent 609fc5ec36
commit a74bfb7dc4
4 changed files with 8 additions and 6 deletions

View File

@ -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)

View File

@ -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

View File

@ -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

View File

@ -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]