From 0e6e7e2b35c9653ee2c61f7aeea8b5a7110f3c217472554080680dfc069cada8 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 22 Oct 2019 20:01:12 +0000 Subject: [PATCH] - 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 --- cloud-init-renderer-detect.patch | 11 +++++++++++ cloud-init.changes | 7 +++++++ cloud-init.spec | 3 +++ 3 files changed, 21 insertions(+) create mode 100644 cloud-init-renderer-detect.patch diff --git a/cloud-init-renderer-detect.patch b/cloud-init-renderer-detect.patch new file mode 100644 index 0000000..1ebe677 --- /dev/null +++ b/cloud-init-renderer-detect.patch @@ -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: diff --git a/cloud-init.changes b/cloud-init.changes index 27b6272..9816394 100644 --- a/cloud-init.changes +++ b/cloud-init.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Oct 22 19:57:22 UTC 2019 - Robert Schweikert + +- 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 diff --git a/cloud-init.spec b/cloud-init.spec index 98f71d0..bac6c13 100644 --- a/cloud-init.spec +++ b/cloud-init.spec @@ -49,6 +49,8 @@ Patch50: cloud-init-noresolv-merge-no-dns-data.diff Patch51: cloud-init-after-wicked.patch # FIXME (lp#1849296) Patch52: cloud-init-break-resolv-symlink.patch +# FIXME +Patch53: cloud-init-renderer-detect.patch BuildRequires: fdupes BuildRequires: filesystem @@ -195,6 +197,7 @@ Documentation and examples for cloud-init tools %patch50 -p1 %patch51 -p1 %patch52 +%patch53 %build %if 0%{?suse_version} && 0%{?suse_version} <= 1315