diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-03-17 15:50:00 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-03-17 15:50:00 -0400 |
| commit | ccdf4ff9966b020a8fd30e5bec87fa82dc20c214 (patch) | |
| tree | 17c501c2c1d6dae80d95d434cafed3e272ed09ce /systemd | |
| parent | ad820a9465642fa13aa6f75e5efb3fbe3059dedc (diff) | |
| download | vyos-cloud-init-ccdf4ff9966b020a8fd30e5bec87fa82dc20c214.tar.gz vyos-cloud-init-ccdf4ff9966b020a8fd30e5bec87fa82dc20c214.zip | |
systemd: update config and final to run even if init jobs fail
LP: #1432758
Diffstat (limited to 'systemd')
| -rw-r--r-- | systemd/cloud-config.service | 5 | ||||
| -rw-r--r-- | systemd/cloud-config.target | 3 | ||||
| -rw-r--r-- | systemd/cloud-final.service | 5 |
3 files changed, 6 insertions, 7 deletions
diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service index 41a86147..ac25c776 100644 --- a/systemd/cloud-config.service +++ b/systemd/cloud-config.service @@ -1,8 +1,7 @@ [Unit] Description=Apply the settings specified in cloud-config -After=network.target syslog.target cloud-config.target -Requires=cloud-config.target -Wants=network.target +After=network.target cloud-config.target syslog.target +Wants=network.target cloud-config.target [Service] Type=oneshot diff --git a/systemd/cloud-config.target b/systemd/cloud-config.target index 28f5bcf1..ae9b7d02 100644 --- a/systemd/cloud-config.target +++ b/systemd/cloud-config.target @@ -7,4 +7,5 @@ [Unit] Description=Cloud-config availability -Requires=cloud-init-local.service cloud-init.service +Wants=cloud-init-local.service cloud-init.service +After=cloud-init-local.service cloud-init.service diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service index ef0f52b9..bbcdf30b 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -1,8 +1,7 @@ [Unit] Description=Execute cloud user/final scripts -After=network.target syslog.target cloud-config.service rc-local.service -Requires=cloud-config.target -Wants=network.target +After=network.target cloud-config.service syslog.target rc-local.service +Wants=network.target cloud-config.service [Service] Type=oneshot |