Merge remote-tracking branch 'immerda/master' into immerda_merge

2 files changed, 7 insertions, 3 deletions

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
index 9b4c9a2..017aed3 100644
--- a/lib/facter/shorewall_major_version.rb
+++ b/lib/facter/shorewall_major_version.rb
@@ -1,6 +1,7 @@
 Facter.add("shorewall_major_version") do
   confine :shorewall_version => /\d/
   setcode do
-    Facter.value(:shorewall_version).split('.').first
+    v = Facter.value('shorewall_version')
+    v.nil? ? nil : v.split('.').first
   end
 end
diff --git a/lib/facter/shorewall_version.rb b/lib/facter/shorewall_version.rb
index 3c1cc67..8990088 100644
--- a/lib/facter/shorewall_version.rb
+++ b/lib/facter/shorewall_version.rb
@@ -1,3 +1,6 @@
-Facter.add("shorewall_version") do
-  setcode 'shorewall version'
+Facter.add('shorewall_version') do
+  setcode do
+    Facter::Util::Resolution.exec('shorewall version')
+  end
 end
+