summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZach Marano <zmarano@google.com>2016-02-12 13:20:09 -0800
committerZach Marano <zmarano@google.com>2016-02-12 13:20:09 -0800
commit4f3475a942d30926ed6c4206f1cb69ae6520e094 (patch)
tree14dddc612e2137802880be5ed434520fc9228ed7
parent1071df4e61e320f8e78abb19521a73233830eab3 (diff)
parente05943a2891e6d8d07d9ed84af48d9ff0bf63a3a (diff)
downloadgoogle-compute-image-packages-4f3475a942d30926ed6c4206f1cb69ae6520e094.tar.gz
Merge branch 'master' of https://github.com/GoogleCloudPlatform/compute-image-packages into upstream
-rw-r--r--google-startup-scripts/usr/lib/systemd/system/google-shutdown-scripts.service11
1 files changed, 7 insertions, 4 deletions
diff --git a/google-startup-scripts/usr/lib/systemd/system/google-shutdown-scripts.service b/google-startup-scripts/usr/lib/systemd/system/google-shutdown-scripts.service
index 039ee46..73adab8 100644
--- a/google-startup-scripts/usr/lib/systemd/system/google-shutdown-scripts.service
+++ b/google-startup-scripts/usr/lib/systemd/system/google-shutdown-scripts.service
@@ -1,12 +1,15 @@
[Unit]
Description=Google Compute Engine user shutdown scripts
-Before=shutdown.target
-DefaultDependencies=false
+After=local-fs.target network-online.target network.target
+After=google.service rsyslog.service
Wants=local-fs.target network-online.target network.target
[Service]
-ExecStart=/usr/share/google/run-shutdown-scripts
+ExecStart=/bin/true
+ExecStop=/usr/share/google/run-shutdown-scripts
Type=oneshot
+RemainAfterExit=true
+TimeoutStopSec=0
[Install]
-WantedBy=shutdown.target
+WantedBy=multi-user.target