fix: update detection of service pack on SLES15

Backport of fusioninventory/fusioninventory-agent#1006
glpi-project · Mar 30, 2022 · 5043b15 · 5043b15
1 parent 9418c6e
commit 5043b15
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
diff --git a/Changes b/Changes
@@ -14,6 +14,7 @@ inventory:
 * database inventory: support default credential to inventory SQL Server 2012 Express
 * linux: Update drive inventory to also try FS related tools to get more information
 * feat: Add OS installation date inventory support for unix/linux
+* Fix linux SLES 15 Service Pack detection, thanks to ncharles@gh
 
 remoteinventory:
 * Fix: Support username for SSH access

diff --git a/lib/GLPI/Agent/Task/Inventory/Linux/Distro/NonLSB.pm b/lib/GLPI/Agent/Task/Inventory/Linux/Distro/NonLSB.pm
@@ -115,10 +115,19 @@ sub _getDistroData {
     };
 
     if ($name eq 'SuSE') {
-        $data->{SERVICE_PACK} = getFirstMatch(
-            file    => '/etc/SuSE-release',
-            pattern => qr/^PATCHLEVEL = ([0-9]+)/
-        );
+        # SLES15 doesn't have /etc/SuSE-release
+        if (-e '/etc/SuSE-release') {
+            $data->{SERVICE_PACK} = getFirstMatch(
+                file    => '/etc/SuSE-release',
+                pattern => qr/^PATCHLEVEL = ([0-9]+)/
+            );
+        } else {
+            # fall back by checking if there's a -SP in the current version
+            # if so, split by -SP
+            if ($version =~ m/\-SP.+/) {
+              ($data->{VERSION}, $data->{SERVICE_PACK}) = $version =~ m/(.*)-SP(.*)/;
+            }
+        }
     }
 
     return $data;