forked from pool/cloud-init
- Add cloud-init-after-wicked.patch
- Change the service order, the cloud-init service wants to run after networking is started OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=147
This commit is contained in:
parent
fcf843e6dd
commit
4977fc7a3b
13
cloud-init-after-wicked.patch
Normal file
13
cloud-init-after-wicked.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: cloud-init-19.1/systemd/cloud-init.service.tmpl
|
||||||
|
===================================================================
|
||||||
|
--- cloud-init-19.1.orig/systemd/cloud-init.service.tmpl
|
||||||
|
+++ cloud-init-19.1/systemd/cloud-init.service.tmpl
|
||||||
|
@@ -14,7 +14,7 @@ After=networking.service
|
||||||
|
After=network.service
|
||||||
|
{% endif %}
|
||||||
|
{% if variant in ["suse"] %}
|
||||||
|
-Before=wicked.service
|
||||||
|
+After=wicked.service
|
||||||
|
# setting hostname via hostnamectl depends on dbus, which otherwise
|
||||||
|
# would not be guaranteed at this point.
|
||||||
|
After=dbus.service
|
@ -1,3 +1,10 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 24 19:50:33 UTC 2019 - Robert Schweikert <rjschwei@suse.com>
|
||||||
|
|
||||||
|
- Add cloud-init-after-wicked.patch
|
||||||
|
- Change the service order, the cloud-init service wants to run after
|
||||||
|
networking is started
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Sep 24 18:46:00 UTC 2019 - Robert Schweikert <rjschwei@suse.com>
|
Tue Sep 24 18:46:00 UTC 2019 - Robert Schweikert <rjschwei@suse.com>
|
||||||
|
|
||||||
|
@ -50,6 +50,8 @@ Patch48: cloud-init-detect-nova.diff
|
|||||||
Patch49: cloud-init-add-static-routes.diff
|
Patch49: cloud-init-add-static-routes.diff
|
||||||
# FIXME (lp#1843634)
|
# FIXME (lp#1843634)
|
||||||
Patch50: cloud-init-noresolv-merge-no-dns-data.diff
|
Patch50: cloud-init-noresolv-merge-no-dns-data.diff
|
||||||
|
# FIXME
|
||||||
|
Patch51: cloud-init-after-wicked.patch
|
||||||
|
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: filesystem
|
BuildRequires: filesystem
|
||||||
@ -196,6 +198,7 @@ Documentation and examples for cloud-init tools
|
|||||||
%patch48 -p1
|
%patch48 -p1
|
||||||
%patch49 -p1
|
%patch49 -p1
|
||||||
%patch50 -p1
|
%patch50 -p1
|
||||||
|
%patch51 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if 0%{?suse_version} && 0%{?suse_version} <= 1315
|
%if 0%{?suse_version} && 0%{?suse_version} <= 1315
|
||||||
|
Loading…
Reference in New Issue
Block a user