From 29723d4dbe048bd2d8a12d6c1c618f51c324a34f37a9248d7e65fffb28bfbb64 Mon Sep 17 00:00:00 2001 From: Robert Schweikert Date: Tue, 22 Oct 2019 21:13:06 +0000 Subject: [PATCH] - Expand patch to more reliably detect the OS OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=154 --- cloud-init-renderer-detect.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/cloud-init-renderer-detect.patch b/cloud-init-renderer-detect.patch index 1ebe677..2296c19 100644 --- a/cloud-init-renderer-detect.patch +++ b/cloud-init-renderer-detect.patch @@ -1,5 +1,14 @@ --- cloudinit/net/sysconfig.py.orig +++ cloudinit/net/sysconfig.py +@@ -748,7 +748,7 @@ class Renderer(renderer.Renderer): + def available(target=None): + sysconfig = available_sysconfig(target=target) + nm = available_nm(target=target) +- return (util.get_linux_distro()[0] in KNOWN_DISTROS ++ return (util.system_info()['variant'] in KNOWN_DISTROS + and any([nm, sysconfig])) + + @@ -758,6 +758,8 @@ def available_sysconfig(target=None): for p in expected: if not util.which(p, search=search, target=target):