forked from pool/cloud-init
- Update cloud-init-service.patch
+ The network must be up an running in order to get ssh key injected OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=57
This commit is contained in:
parent
10e8058495
commit
9c42ade550
@ -1,6 +1,6 @@
|
|||||||
--- systemd/cloud-init.service.orig
|
--- systemd/cloud-init.service.orig
|
||||||
+++ systemd/cloud-init.service
|
+++ systemd/cloud-init.service
|
||||||
@@ -1,9 +1,20 @@
|
@@ -1,9 +1,19 @@
|
||||||
[Unit]
|
[Unit]
|
||||||
Description=Initial cloud-init job (metadata service crawler)
|
Description=Initial cloud-init job (metadata service crawler)
|
||||||
-After=cloud-init-local.service networking.service
|
-After=cloud-init-local.service networking.service
|
||||||
@ -14,10 +14,9 @@
|
|||||||
+Wants=sshd.service
|
+Wants=sshd.service
|
||||||
+After=cloud-init-local.service
|
+After=cloud-init-local.service
|
||||||
+After=network.service
|
+After=network.service
|
||||||
|
+After=network-online.target
|
||||||
+Requires=network.service
|
+Requires=network.service
|
||||||
+Before=basic.target
|
+Before=basic.target
|
||||||
+Before=dbus.socket
|
|
||||||
+Before=network-online.target
|
|
||||||
+Before=sshd-keygen.service
|
+Before=sshd-keygen.service
|
||||||
+Before=sshd.service
|
+Before=sshd.service
|
||||||
+Before=systemd-user-sessions.service
|
+Before=systemd-user-sessions.service
|
||||||
@ -25,9 +24,23 @@
|
|||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
@@ -15,4 +26,4 @@ TimeoutSec=0
|
@@ -15,4 +25,4 @@ TimeoutSec=0
|
||||||
StandardOutput=journal+console
|
StandardOutput=journal+console
|
||||||
|
|
||||||
[Install]
|
[Install]
|
||||||
-WantedBy=cloud-init.target
|
-WantedBy=cloud-init.target
|
||||||
+WantedBy=multi-user.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
|
||||||
|
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Oct 28 19:20:32 UTC 2016 - rjschwei@suse.com
|
||||||
|
|
||||||
|
- Update cloud-init-service.patch
|
||||||
|
+ The network must be up an running in order to get ssh key injected
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Oct 28 15:21:39 UTC 2016 - rjschwei@suse.com
|
Fri Oct 28 15:21:39 UTC 2016 - rjschwei@suse.com
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user