Join systemd dependency lines

This is consistent with other units, and arguably easier to find/read the dependency list if it's on a single line. Also add comments to clarify one of the dependencies.
bottlerocket-os · Oct 21, 2019 · c4e56ef · c4e56ef
1 parent b23d21a
commit c4e56ef
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/packages/workspaces/moondog.service b/packages/workspaces/moondog.service
@@ -1,9 +1,8 @@
 [Unit]
 Description=Thar userdata configuration system
-After=network-online.target
-After=apiserver.service
-Requires=network-online.target
-Requires=apiserver.service
+# Need network online to talk to IMDS.
+After=network-online.target apiserver.service
+Requires=network-online.target apiserver.service
 # We only want to run once, at first boot. This file is created by moondog
 # after a successful run.
 ConditionPathExists=!/var/lib/thar/moondog.ran

diff --git a/packages/workspaces/sundog.service b/packages/workspaces/sundog.service
@@ -1,10 +1,8 @@
 [Unit]
 Description=User-specified setting generators
-After=network-online.target
-After=apiserver.service
-After=moondog.service
-Requires=network-online.target
-Requires=apiserver.service
+# Need network access to support commands talking to IMDS.
+After=network-online.target apiserver.service moondog.service
+Requires=network-online.target apiserver.service
 
 [Service]
 Type=oneshot