- Add cloud-init-renderer-detect.patch (bsc#1154092)

+ Short curcuit the conditional for identifying the sysconfig renderer.
    If we find ifup/ifdown accept the renderer as available.

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=151
This commit is contained in:
Robert Schweikert 2019-10-22 20:01:12 +00:00 committed by Git OBS Bridge
parent e61b62e5b9
commit 0e6e7e2b35
3 changed files with 21 additions and 0 deletions

View File

@ -0,0 +1,11 @@
--- cloudinit/net/sysconfig.py.orig
+++ cloudinit/net/sysconfig.py
@@ -758,6 +758,8 @@ def available_sysconfig(target=None):
for p in expected:
if not util.which(p, search=search, target=target):
return False
+ else:
+ return True
expected_paths = ['etc/sysconfig/network/scripts/functions.netconfig']
for p in expected_paths:

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Oct 22 19:57:22 UTC 2019 - Robert Schweikert <rjschwei@suse.com>
- Add cloud-init-renderer-detect.patch (bsc#1154092)
+ Short curcuit the conditional for identifying the sysconfig renderer.
If we find ifup/ifdown accept the renderer as available.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Oct 22 12:13:59 UTC 2019 - Robert Schweikert <rjschwei@suse.com> Tue Oct 22 12:13:59 UTC 2019 - Robert Schweikert <rjschwei@suse.com>

View File

@ -49,6 +49,8 @@ Patch50: cloud-init-noresolv-merge-no-dns-data.diff
Patch51: cloud-init-after-wicked.patch Patch51: cloud-init-after-wicked.patch
# FIXME (lp#1849296) # FIXME (lp#1849296)
Patch52: cloud-init-break-resolv-symlink.patch Patch52: cloud-init-break-resolv-symlink.patch
# FIXME
Patch53: cloud-init-renderer-detect.patch
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: filesystem BuildRequires: filesystem
@ -195,6 +197,7 @@ Documentation and examples for cloud-init tools
%patch50 -p1 %patch50 -p1
%patch51 -p1 %patch51 -p1
%patch52 %patch52
%patch53
%build %build
%if 0%{?suse_version} && 0%{?suse_version} <= 1315 %if 0%{?suse_version} && 0%{?suse_version} <= 1315