summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schweikert <rjschwei@suse.com>2017-11-19 15:51:24 -0500
committerScott Moser <smoser@ubuntu.com>2017-12-11 16:56:14 -0500
commit022e8688050f19977842ee807bf2e699625b2ff8 (patch)
tree998bd0b116d532b1e2613011f03dc90844d4b6eb
parent1d1c31292a0d10e3dd8940739b577fad9d18f5c5 (diff)
downloadvyos-cloud-init-022e8688050f19977842ee807bf2e699625b2ff8.tar.gz
vyos-cloud-init-022e8688050f19977842ee807bf2e699625b2ff8.zip
SUSE: remove delta in systemd local template for SUSE
On openSUSE and SLES systemd is allowed to pull the default dependencies, thus setting "Before=basic.target" is incorrect and creates a cycle leading to the deletion of the cloud-init-local.service
-rw-r--r--systemd/cloud-init-local.service.tmpl6
1 files changed, 0 insertions, 6 deletions
diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
index bf6b2961..ff9c644d 100644
--- a/systemd/cloud-init-local.service.tmpl
+++ b/systemd/cloud-init-local.service.tmpl
@@ -13,12 +13,6 @@ Before=shutdown.target
Before=sysinit.target
Conflicts=shutdown.target
{% endif %}
-{% if variant in ["suse"] %}
-# Other distros use Before=sysinit.target. There is not a clearly identified
-# reason for usage of basic.target instead.
-Before=basic.target
-Conflicts=shutdown.target
-{% endif %}
RequiresMountsFor=/var/lib/cloud
[Service]