diff options
| author | Robert Schweikert <rjschwei@suse.com> | 2017-09-21 07:38:48 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2017-09-21 14:15:50 -0400 |
| commit | 0451a9f60960da56e3af4f97bbcece3d98482f86 (patch) | |
| tree | 6028fe4d5ba2cde48545bfc8a2a6142785ace7b6 /systemd/cloud-init.service.tmpl | |
| parent | 243ec59fb62a8710430f9ba1e2490ee964c1abc0 (diff) | |
| download | vyos-cloud-init-0451a9f60960da56e3af4f97bbcece3d98482f86.tar.gz vyos-cloud-init-0451a9f60960da56e3af4f97bbcece3d98482f86.zip | |
suse: updates to templates to support openSUSE and SLES.
Things done here:
- identify 'suse' as a variant in util.system_info and
also tools/render-cloudcfg.
- update systemd and cloud.cfg templates for suse specific changes.
LP: #1718640
Diffstat (limited to 'systemd/cloud-init.service.tmpl')
| -rw-r--r-- | systemd/cloud-init.service.tmpl | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl index 2c71889d..b92e8abc 100644 --- a/systemd/cloud-init.service.tmpl +++ b/systemd/cloud-init.service.tmpl @@ -13,6 +13,13 @@ After=networking.service {% if variant in ["centos", "fedora", "redhat"] %} After=network.service {% endif %} +{% if variant in ["suse"] %} +Requires=wicked.service +After=wicked.service +# setting hostname via hostnamectl depends on dbus, which otherwise +# would not be guaranteed at this point. +After=dbus.service +{% endif %} Before=network-online.target Before=sshd-keygen.service Before=sshd.service @@ -20,6 +27,9 @@ Before=sshd.service Before=sysinit.target Conflicts=shutdown.target {% endif %} +{% if variant in ["suse"] %} +Conflicts=shutdown.target +{% endif %} Before=systemd-user-sessions.service [Service] |