blob: 4adfa49fc7f77c196ab49b36d8d8d49225722fa6 [file] [log] [blame]
From c3703674dc73b19cabd9388c828931dc52b13232 Mon Sep 17 00:00:00 2001
From: Dexter Rivera <riverade@google.com>
Date: Wed, 19 Feb 2020 13:45:23 -0800
Subject: [PATCH] Fix systemd units dependencies
---
.../src/lib/systemd/system/google-network-daemon.service | 3 ++-
.../src/lib/systemd/system/google-shutdown-scripts.service | 3 ++-
.../src/lib/systemd/system/google-startup-scripts.service | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service b/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service
index 71745d4..b4dd4bc 100644
--- a/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service
+++ b/packages/google-compute-engine/src/lib/systemd/system/google-network-daemon.service
@@ -1,7 +1,8 @@
[Unit]
Description=Google Compute Engine Network Daemon
-After=network-online.target network.target
+After=network-online.target
After=google-instance-setup.service
+Wants=network-online.target
PartOf=network.service
[Service]
diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service b/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service
index ae23d76..c498de3 100644
--- a/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service
+++ b/packages/google-compute-engine/src/lib/systemd/system/google-shutdown-scripts.service
@@ -1,7 +1,8 @@
[Unit]
Description=Google Compute Engine Shutdown Scripts
-After=network-online.target network.target rsyslog.service
+After=network-online.target systemd-resolved.service
After=google-instance-setup.service google-network-daemon.service
+Wants=network-online.target
[Service]
ExecStart=/bin/true
diff --git a/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service b/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
index 233298a..68af491 100644
--- a/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
+++ b/packages/google-compute-engine/src/lib/systemd/system/google-startup-scripts.service
@@ -1,7 +1,8 @@
[Unit]
Description=Google Compute Engine Startup Scripts
-After=network-online.target network.target rsyslog.service
+After=network-online.target
After=google-instance-setup.service google-network-daemon.service
+Wants=network-online.target
[Service]
ExecStart=/usr/bin/google_metadata_script_runner --script-type startup
--
2.25.0.265.gbab2e86ba0-goog