forked from pool/cloud-init
Robert Schweikert
3ed6919cb4
+ Remove cloud-init-no-user-lock-if-already-locked.patch
cloud-init 18.4 is not supported on SLE 11 code base
+ Remove 0001-Support-chrony-configuration-lp-1731619.patch
Included upstream
+ Remove 0003-Distro-dependent-chrony-config-file.patch
Included upstream
+ Remove 0001-switch-to-using-iproute2-tools.patch
Included upstream
+ Remove cloud-init-no-python-linux-dist.patch
Included upstream
+ Remove cloud-init-no-trace-empt-sect.patch
Included upstream
+ Remove cloud-init-setpath-dsitentify.patch
Included upstream
+ Modify fix-default-systemd-unit-dir.patch
Use pkg-config, only modify the generator
+ Remove cloud-init-sysconfig-netpathfix.patch
Fixed upstream
+ Removed cloud-init-skip-ovf-tests.patch
Fixed upstream
+ Removed cloud-init-translate-netconf-ipv4-keep-gw.patch
Fixed upstream
+ Add cloud-init-template-py2.patch avoid Python 3 dependency when we build
for distros with Python 2 support
+ Add 0001-Follow-the-ever-bouncing-ball-for-openSUSE-distribut.patch
+ Add 0002-Add-tests-for-additional-openSUSE-distro-condition-m.patch
+ Add cloud-init-sysconf-path.patch
+ Add cloud-init-sysconf-ethsetup.patch
+ Add 0001-Fix-the-service-order-for-SUSE-distributions.patch
OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=121
29 lines
965 B
Diff
29 lines
965 B
Diff
From 1f7950f72dc5f3603118c0f91dca3fb7145f0801 Mon Sep 17 00:00:00 2001
|
|
From: Robert Schweikert <rjschwei@suse.com>
|
|
Date: Wed, 24 Oct 2018 09:50:11 -0400
|
|
Subject: [PATCH] - Fix the service order for SUSE distributions + Network
|
|
configuration file gets written when cloud-init.service runs. Therefore
|
|
this needs to run prior to the network tools (wicked)
|
|
|
|
---
|
|
systemd/cloud-init.service.tmpl | 3 +--
|
|
1 file changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/systemd/cloud-init.service.tmpl b/systemd/cloud-init.service.tmpl
|
|
index b92e8abc..5cb00371 100644
|
|
--- a/systemd/cloud-init.service.tmpl
|
|
+++ b/systemd/cloud-init.service.tmpl
|
|
@@ -14,8 +14,7 @@ After=networking.service
|
|
After=network.service
|
|
{% endif %}
|
|
{% if variant in ["suse"] %}
|
|
-Requires=wicked.service
|
|
-After=wicked.service
|
|
+Before=wicked.service
|
|
# setting hostname via hostnamectl depends on dbus, which otherwise
|
|
# would not be guaranteed at this point.
|
|
After=dbus.service
|
|
--
|
|
2.13.7
|
|
|