Merge branch 'master' into puppet4

2 files changed, 8 insertions, 9 deletions

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
new file mode 100644
index 0000000..9b4c9a2
--- /dev/null
+++ b/lib/facter/shorewall_major_version.rb
@@ -0,0 +1,6 @@
+Facter.add("shorewall_major_version") do
+  confine :shorewall_version => /\d/
+  setcode do
+    Facter.value(:shorewall_version).split('.').first
+  end
+end
diff --git a/lib/facter/shorewall_version.rb b/lib/facter/shorewall_version.rb
index 9c53ec2..3c1cc67 100644
--- a/lib/facter/shorewall_version.rb
+++ b/lib/facter/shorewall_version.rb
@@ -1,10 +1,3 @@
-Facter.add("shorewall_major_version") do
-  setcode do
-    shorewall_version = Facter::Util::Resolution.exec('shorewall version')
-    if shorewall_version != nil
-        shorewall_major_version = shorewall_version.split('.').first
-    else
-      shorewall_major_version = '-1'
-    end
-  end
+Facter.add("shorewall_version") do
+  setcode 'shorewall version'
 end