← Back to team overview

cloud-init-dev team mailing list archive

[Merge] ~rjschwei/cloud-init:systemdTmpl into cloud-init:master

 

Robert Schweikert has proposed merging ~rjschwei/cloud-init:systemdTmpl into cloud-init:master.

Requested reviews:
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~rjschwei/cloud-init/+git/cloud-init/+merge/333940

As promised a while ago, I investigated the questionable condition for SUSE based distros in cloud-init-local.service. This is the fix/result of the investigation the condition for Before=basic.target should not exist.
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~rjschwei/cloud-init:systemdTmpl into cloud-init:master.
diff --git a/systemd/cloud-init-local.service.tmpl b/systemd/cloud-init-local.service.tmpl
index bf6b296..ff9c644 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]

Follow ups