rpm/cloud-init
SHA256
1
0
Fork 0
forked from pool/cloud-init
Code Pull Requests Activity

- Update cloud-init-service.patch

Browse Source 
+ 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

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=59
This commit is contained in:
Robert Schweikert 2016-10-28 20:16:14 +00:00 committed by Git OBS Bridge
parent ad94d4c4c4
commit 19c29b64a4
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cloud-init-service.patch
View File

@ -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,21 @@ @@ -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
@ -13,9 +13,7 @@
+Wants=sshd-keygen.service +Wants=sshd-keygen.service
+Wants=sshd.service +Wants=sshd.service
+After=cloud-init-local.service +After=cloud-init-local.service
+After=network.service
+After=wicked.service +After=wicked.service
+Requires=network.service
+Requires=wicked.service +Requires=wicked.service
+Before=basic.target +Before=basic.target
+Before=network-online.target +Before=network-online.target
@ -26,12 +24,6 @@
[Service] [Service]
Type=oneshot 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.orig
+++ systemd/cloud-init-local.service +++ systemd/cloud-init-local.service
@@ -4,9 +4,10 @@ DefaultDependencies=no @@ -4,9 +4,10 @@ DefaultDependencies=no

8
cloud-init.changes
View File

@ -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 Fri Oct 28 19:37:24 UTC 2016 - rjschwei@suse.com