diff options
| author | Scott Moser <smoser@ubuntu.com> | 2015-11-30 15:33:28 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2015-11-30 15:33:28 -0500 |
| commit | f512c0126aac5c8708065c6e8aa5510f83574657 (patch) | |
| tree | 8c7f8152733bcbb41921049263729278e8245ff3 | |
| parent | 97fbe6e44fc09d7522001deb7e3984272e9c26b7 (diff) | |
| download | vyos-cloud-init-f512c0126aac5c8708065c6e8aa5510f83574657.tar.gz vyos-cloud-init-f512c0126aac5c8708065c6e8aa5510f83574657.zip | |
systemd/power_state: fix power_state when cloud-final exited failure
if a runcmd exited failure, then power_state would not work.
This was because systemd was killing off subprocesses, and cloud-init
implemented power off with a subprocess that waited for the parent
to exit.
LP: #1449318
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | systemd/cloud-final.service | 1 |
2 files changed, 3 insertions, 0 deletions
@@ -69,6 +69,8 @@ as install from server or desktop ISO. (LP: #1177432) - cc_mounts: use 'nofail' if system uses systemd. (LP: #1514485) - Azure: get instance id from dmi instead of SharedConfig (LP: #1506187) + - systemd/power_state: fix power_state to work even if cloud-final + exited non-zero (LP: #1449318) 0.7.6: - open 0.7.6 - Enable vendordata on CloudSigma datasource (LP: #1303986) diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service index c023ad94..bcbdd36f 100644 --- a/systemd/cloud-final.service +++ b/systemd/cloud-final.service @@ -8,6 +8,7 @@ Type=oneshot ExecStart=/usr/bin/cloud-init modules --mode=final RemainAfterExit=yes TimeoutSec=0 +KillMode=process # Output needs to appear in instance console output StandardOutput=journal+console |