Merge remote-tracking branch 'shared/master'HEADmaster

2 files changed, 13 insertions, 0 deletions

diff --git a/lib/facter/shorewall_major_version.rb b/lib/facter/shorewall_major_version.rb
new file mode 100644
index 0000000..017aed3
--- /dev/null
+++ b/lib/facter/shorewall_major_version.rb
@@ -0,0 +1,7 @@
+Facter.add("shorewall_major_version") do
+  confine :shorewall_version => /\d/
+  setcode do
+    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
new file mode 100644
index 0000000..8990088
--- /dev/null
+++ b/lib/facter/shorewall_version.rb
@@ -0,0 +1,6 @@
+Facter.add('shorewall_version') do
+  setcode do
+    Facter::Util::Resolution.exec('shorewall version')
+  end
+end
+