6 files changed, 24 insertions, 3 deletions
diff --git a/systemd/cloud-config.service b/systemd/cloud-config.service.tmpl
index 3309e08a..bdee3ce0 100644
--- a/systemd/cloud-config.service
+++ b/systemd/cloud-config.service.tmpl
@@ -1,3 +1,4 @@
+## template:jinja
 [Unit]
 Description=Apply the settings specified in cloud-config
 After=network-online.target cloud-config.target
diff --git a/systemd/cloud-final.service b/systemd/cloud-final.service.tmpl
index b8f69b78..fc01b891 100644
--- a/systemd/cloud-final.service
+++ b/systemd/cloud-final.service.tmpl
@@ -1,7 +1,12 @@
+## template:jinja
 [Unit]
 Description=Execute cloud user/final scripts
-After=network-online.target cloud-config.service rc-local.service multi-user.target
+After=network-online.target cloud-config.service rc-local.service
+{% if variant in ["ubuntu", "unknown", "debian"] %}
+After=multi-user.target
+{% endif %}
 Wants=network-online.target cloud-config.service
+Before=apt-daily.service
 
 [Service]
 Type=oneshot
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service.tmpl
index 7ee43eda..ff9c644d 100644
--- a/systemd/cloud-init-local.service
+++ b/systemd/cloud-init-local.service.tmpl
@@ -1,13 +1,18 @@
+## template:jinja
 [Unit]
 Description=Initial cloud-init job (pre-networking)
+{% if variant in ["ubuntu", "unknown", "debian"] %}
 DefaultDependencies=no
+{% endif %}
 Wants=network-pre.target
 After=systemd-remount-fs.service
 Before=NetworkManager.service
 Before=network-pre.target
 Before=shutdown.target
+{% if variant in ["ubuntu", "unknown", "debian"] %}
 Before=sysinit.target
 Conflicts=shutdown.target
+{% endif %}
 RequiresMountsFor=/var/lib/cloud
 
 [Service]
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service.tmpl
index 39acc20a..2c71889d 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service.tmpl
@@ -1,3 +1,4 @@
+## template:jinja
 [Unit]
 Description=Initial cloud-init job (metadata service crawler)
 DefaultDependencies=no
@@ -6,13 +7,20 @@ Wants=sshd-keygen.service
 Wants=sshd.service
 After=cloud-init-local.service
 After=systemd-networkd-wait-online.service
+{% if variant in ["ubuntu", "unknown", "debian"] %}
 After=networking.service
+{% endif %}
+{% if variant in ["centos", "fedora", "redhat"] %}
+After=network.service
+{% endif %}
 Before=network-online.target
 Before=sshd-keygen.service
 Before=sshd.service
+{% if variant in ["ubuntu", "unknown", "debian"] %}
 Before=sysinit.target
-Before=systemd-user-sessions.service
 Conflicts=shutdown.target
+{% endif %}
+Before=systemd-user-sessions.service
 
 [Service]
 Type=oneshot
diff --git a/systemd/cloud-init.target b/systemd/cloud-init.target
index d5684582..083c3b6f 100644
--- a/systemd/cloud-init.target
+++ b/systemd/cloud-init.target
@@ -1,6 +1,6 @@
 # cloud-init target is enabled by cloud-init-generator
 # To disable it you can either:
-#  a.) boot with kernel cmdline of 'cloudinit=disabled'
+#  a.) boot with kernel cmdline of 'cloud-init=disabled'
 #  b.) touch a file /etc/cloud/cloud-init.disabled
 [Unit]
 Description=Cloud-init target
diff --git a/systemd/systemd-fsck@.service.d/cloud-init.conf b/systemd/systemd-fsck@.service.d/cloud-init.conf
new file mode 100644
index 00000000..0bfa465b
--- /dev/null
+++ b/systemd/systemd-fsck@.service.d/cloud-init.conf
@@ -0,0 +1,2 @@
+[Unit]
+After=cloud-init.service