- Expand patch to more reliably detect the OS

OBS-URL: https://build.opensuse.org/package/show/Cloud:Tools/cloud-init?expand=0&rev=154
This commit is contained in:
Robert Schweikert 2019-10-22 21:13:06 +00:00 committed by Git OBS Bridge
parent e57d5d5263
commit 29723d4dbe

View File

@ -1,5 +1,14 @@
--- cloudinit/net/sysconfig.py.orig --- cloudinit/net/sysconfig.py.orig
+++ cloudinit/net/sysconfig.py +++ 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): @@ -758,6 +758,8 @@ def available_sysconfig(target=None):
for p in expected: for p in expected:
if not util.which(p, search=search, target=target): if not util.which(p, search=search, target=target):