From ad94d4c4c421fd6c95f5790de6cdf7286202b4386bcb166665ed116d70a9fca5 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Fri, 28 Oct 2016 19:38:58 +0000 Subject: [PATCH] - Update cloud-init-service.patch + 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 --- cloud-init-service.patch | 8 +++++--- cloud-init.changes | 9 +++++++++ 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/cloud-init-service.patch b/cloud-init-service.patch index c04caee..39ee5dc 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,19 @@ +@@ -1,9 +1,21 @@ [Unit] Description=Initial cloud-init job (metadata service crawler) -After=cloud-init-local.service networking.service @@ -14,9 +14,11 @@ +Wants=sshd.service +After=cloud-init-local.service +After=network.service -+After=network-online.target ++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 @@ -24,7 +26,7 @@ [Service] Type=oneshot -@@ -15,4 +25,4 @@ TimeoutSec=0 +@@ -15,4 +27,4 @@ TimeoutSec=0 StandardOutput=journal+console [Install] diff --git a/cloud-init.changes b/cloud-init.changes index eb9909d..a4919b8 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Oct 28 19:37:24 UTC 2016 - rjschwei@suse.com + +- Update cloud-init-service.patch + + We need the following order: + - something brings networking fully up (in our case wicked) + - cloud-init.service runs + - network-online.target is reached + ------------------------------------------------------------------- Fri Oct 28 19:20:32 UTC 2016 - rjschwei@suse.com