summaryrefslogtreecommitdiff
path: root/systemd
diff options
context:
space:
mode:
Diffstat (limited to 'systemd')
-rw-r--r--systemd/cloud-init-local.service4
-rw-r--r--systemd/cloud-init.service17
2 files changed, 17 insertions, 4 deletions
diff --git a/systemd/cloud-init-local.service b/systemd/cloud-init-local.service
index b19eeaee..55834ba4 100644
--- a/systemd/cloud-init-local.service
+++ b/systemd/cloud-init-local.service
@@ -4,9 +4,11 @@ DefaultDependencies=no
Wants=local-fs.target
Wants=network-pre.target
After=local-fs.target
-Conflicts=shutdown.target
+Before=basic.target
+Before=NetworkManager.service
Before=network-pre.target
Before=shutdown.target
+Conflicts=shutdown.target
[Service]
Type=oneshot
diff --git a/systemd/cloud-init.service b/systemd/cloud-init.service
index 6fb655e6..5c71b213 100644
--- a/systemd/cloud-init.service
+++ b/systemd/cloud-init.service
@@ -1,9 +1,20 @@
[Unit]
Description=Initial cloud-init job (metadata service crawler)
-After=cloud-init-local.service networking.service
-Before=network-online.target sshd.service sshd-keygen.service systemd-user-sessions.service
+DefaultDependencies=no
+Wants=cloud-init-local.service
+Wants=local-fs.target
+Wants=sshd-keygen.service
+Wants=sshd.service
+After=cloud-init-local.service
+After=networking.service
Requires=networking.service
-Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.service
+Before=basic.target
+Before=dbus.socket
+Before=network-online.target
+Before=sshd-keygen.service
+Before=sshd.service
+Before=systemd-user-sessions.service
+Conflicts=shutdown.target
[Service]
Type=oneshot