summaryrefslogtreecommitdiff
path: root/systemd
diff options
context:
space:
mode:
authorScott Moser <smoser@brickies.net>2016-11-10 10:41:47 -0500
committerScott Moser <smoser@brickies.net>2016-11-10 17:09:29 -0500
commitf7d6bfadf4c84e702e950851e8001ee8f4e3c4b4 (patch)
tree0d8486860b87bab7181252270f4d544587cf4676 /systemd
parente568aec31051674901047ee577f6e229785cbfc3 (diff)
downloadvyos-cloud-init-f7d6bfadf4c84e702e950851e8001ee8f4e3c4b4.tar.gz
vyos-cloud-init-f7d6bfadf4c84e702e950851e8001ee8f4e3c4b4.zip
systemd: networking service adjustments.
Here we drop the Requires=networking.service but keep the After=networking.service. The change there is that we no longer force networking.service to run, as the system may not have it or be configured to use it. Second, we add After=systemd-networkd-wait-online.service. That causes us to run after systemd-networkd has brought networking up. The end result is that we now run after both ifupdown or systemd-networkd (if they were going to run) but do not force either to run. One other change is that by dropping Requires=networking.service cloud-init will now run even if networking failed to come up. LP: #1636912
Diffstat (limited to 'systemd')
-rw-r--r--systemd/cloud-init.service2
1 files changed, 1 insertions, 1 deletions
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index 03ea87a0..85e447d2 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service
@@ -7,7 +7,7 @@ Wants=sshd-keygen.service
Wants=sshd.service
After=cloud-init-local.service
After=networking.service
-Requires=networking.service
+After=systemd-networkd-wait-online.service
Before=network-online.target
Before=sshd-keygen.service
Before=sshd.service