summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Schweikert <rjschwei@suse.com>2017-09-24 15:10:36 -0400
committerScott Moser <smoser@brickies.net>2017-10-02 15:27:17 -0400
commit6f2aaf7b0fa9fd9376561e9b6233b4d36de51da1 (patch)
treef62f272647c3e128610b88ecf8d929eb99e7e41f
parentb3acdff390329c8091b880b490e1f27441a7a486 (diff)
downloadvyos-cloud-init-6f2aaf7b0fa9fd9376561e9b6233b4d36de51da1.tar.gz
vyos-cloud-init-6f2aaf7b0fa9fd9376561e9b6233b4d36de51da1.zip
systemd: only mention Before=apt-daily.service on debian based distros.
Ordering on apt service should only be set up on Debian based distributions. This changes is really a net-zero in runtime result. But, mentioning apt on a rpm based distro could be confusing.
-rw-r--r--systemd/cloud-final.service.tmpl3
1 files changed, 2 insertions, 1 deletions
diff --git a/systemd/cloud-final.service.tmpl b/systemd/cloud-final.service.tmpl
index fc01b891..e2b91255 100644
--- a/systemd/cloud-final.service.tmpl
+++ b/systemd/cloud-final.service.tmpl
@@ -4,9 +4,10 @@ Description=Execute cloud user/final scripts
After=network-online.target cloud-config.service rc-local.service
{% if variant in ["ubuntu", "unknown", "debian"] %}
After=multi-user.target
+Before=apt-daily.service
{% endif %}
Wants=network-online.target cloud-config.service
-Before=apt-daily.service
+
[Service]
Type=oneshot