forked from pool/cloud-init
Robert Schweikert
ad94d4c4c4
+ We need the following order:
- something brings networking fully up (in our case wicked)
- cloud-init.service runs
- network-online.target is reached
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=58
49 lines
1.3 KiB
Diff
49 lines
1.3 KiB
Diff
--- systemd/cloud-init.service.orig
|
|
+++ systemd/cloud-init.service
|
|
@@ -1,9 +1,21 @@
|
|
[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
|
|
-Requires=networking.service
|
|
-Wants=local-fs.target cloud-init-local.service sshd.service sshd-keygen.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=network.service
|
|
+After=wicked.service
|
|
+Requires=network.service
|
|
+Requires=wicked.service
|
|
+Before=basic.target
|
|
+Before=network-online.target
|
|
+Before=sshd-keygen.service
|
|
+Before=sshd.service
|
|
+Before=systemd-user-sessions.service
|
|
+Conflicts=shutdown.target
|
|
|
|
[Service]
|
|
Type=oneshot
|
|
@@ -15,4 +27,4 @@ TimeoutSec=0
|
|
StandardOutput=journal+console
|
|
|
|
[Install]
|
|
-WantedBy=cloud-init.target
|
|
+WantedBy=multi-user.target
|
|
--- systemd/cloud-init-local.service.orig
|
|
+++ systemd/cloud-init-local.service
|
|
@@ -4,9 +4,10 @@ DefaultDependencies=no
|
|
Wants=local-fs.target
|
|
Wants=network-pre.target
|
|
After=local-fs.target
|
|
-Conflicts=shutdown.target
|
|
+Before=basic.target
|
|
Before=network-pre.target
|
|
Before=shutdown.target
|
|
+Conflicts=shutdown.target
|
|
|
|
[Service]
|
|
Type=oneshot
|