Merge pull request #2749 from mhashizume/FACT-3140/main/sles-lsblk-fixup

Add error handling for older lsblk
puppetlabs · Aug 29, 2024 · 8fadeeb · 8fadeeb
2 parents b6cf607 + f0d4066
commit 8fadeeb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/facter/resolvers/partitions.rb b/lib/facter/resolvers/partitions.rb
@@ -123,7 +123,8 @@ def populate_from_lsblk(partition_name, blkid_and_lsblk)
           return {} unless available?('lsblk', blkid_and_lsblk)
 
           lsblk_version_raw = Facter::Core::Execution.execute('lsblk --version 2>&1', logger: log)
-          lsblk_version = lsblk_version_raw.match(/ \d\.\d+/)[0].to_f
+          # Return if the version of lsblk is too old (< 2.22) to support the --version flag
+          lsblk_version_raw.match?(/ \d\.\d+/) ? lsblk_version = lsblk_version_raw.match(/ \d\.\d+/)[0].to_f : (return {})
 
           # The -p/--paths option was added in lsblk 2.23, return early and fall back to blkid with earlier versions
           return {} if lsblk_version < 2.23