diff --git a/cloud-init-service.patch b/cloud-init-service.patch index cf4c4d3..c04caee 100644 --- a/cloud-init-service.patch +++ b/cloud-init-service.patch @@ -1,6 +1,6 @@ --- systemd/cloud-init.service.orig +++ systemd/cloud-init.service -@@ -1,9 +1,20 @@ +@@ -1,9 +1,19 @@ [Unit] Description=Initial cloud-init job (metadata service crawler) -After=cloud-init-local.service networking.service @@ -14,10 +14,9 @@ +Wants=sshd.service +After=cloud-init-local.service +After=network.service ++After=network-online.target +Requires=network.service +Before=basic.target -+Before=dbus.socket -+Before=network-online.target +Before=sshd-keygen.service +Before=sshd.service +Before=systemd-user-sessions.service @@ -25,9 +24,23 @@ [Service] Type=oneshot -@@ -15,4 +26,4 @@ TimeoutSec=0 +@@ -15,4 +25,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 diff --git a/cloud-init.changes b/cloud-init.changes index 6afb6e7..eb9909d 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -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