From f65056a0472276295b92916199d330a996b3e880 Mon Sep 17 00:00:00 2001
From: Jarrod Johnson <jjohnson2@lenovo.com>
Date: Thu, 2 Sep 2021 08:05:11 -0400
Subject: [PATCH] Fix Suse image fingeprinting

---
 imgutil/imgutil | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/imgutil/imgutil b/imgutil/imgutil
index a3c7d241..4025c18f 100644
--- a/imgutil/imgutil
+++ b/imgutil/imgutil
@@ -799,20 +799,27 @@ def fingerprint_host_el(args, hostpath='/'):
 
 
 def fingerprint_host_suse(args, hostpath='/'):
-    try:
-        import rpm
-    except ImportError:
-        return None
-    ts = rpm.TransactionSet(hostpath)
-    rpms = ts.dbMatch('provides', 'distribution-release')
+    vers = None
     osname = None
-    for inf in rpms:
-        if b'openSUSE' in inf.name and b'Leap' in inf.summary:
-            osname = 'opensuse_leap'
-        if inf.name.startswith(b'SLE_'):
-            osname = 'sle'
+    try:
+        with open(os.path.join(hostpath, 'etc/os-release')) as relfile:
+            relinfo = relfile.read().split('\n')
+            for inf in relinfo:
+                if '=' in inf:
+                    key, val = inf.split('=', 1)
+                    if key == 'ID':
+                        if val.lower().replace('"', '') == 'opensuse-leap':
+                            osname = 'opensuse_leap'
+                        elif val.lower().replace(
+                                '"', '') in ('sle_hpc', 'sles'):
+                            osname = 'sle'
+                    elif key == 'VERSION_ID':
+                        vers = val.replace('"', '')
+    except IOError:
+        pass
     if osname:
-        return SuseHandler(osname, inf.version, os.uname().machine, args)
+        return SuseHandler(osname, vers, os.uname().machine, args)
+
 
 def fingerprint_host(args, hostpath='/'):
     oshandler = None