diff --git a/cloud-init-service.patch b/cloud-init-service.patch index 39ee5dc..a411ade 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,21 @@ +@@ -1,9 +1,19 @@ [Unit] Description=Initial cloud-init job (metadata service crawler) -After=cloud-init-local.service networking.service @@ -13,9 +13,7 @@ +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 @@ -26,12 +24,6 @@ [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 diff --git a/cloud-init.changes b/cloud-init.changes index a4919b8..99102d9 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Oct 28 20:14:48 UTC 2016 - rjschwei@suse.com + +- Update cloud-init-service.patch + + Better match upstream intend Ubuntu networking.service is equivalent + to SUSE wicked, thus we cannot translate networking to network, but need + to translate it to wicked + ------------------------------------------------------------------- Fri Oct 28 19:37:24 UTC 2016 - rjschwei@suse.com