summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBostjan Skufca <bostjan@a2o.si>2010-01-08 09:49:28 +0100
committerJames Turnbull <james@lovedthanlost.net>2010-04-24 15:48:59 +1000
commit97879f9f576484b54fde41326a87129a1fe4f8b6 (patch)
treeeff763fcb257bb9880cdd0ddcfaa3492175fe4c9
parent802e6c24a0968deb0b45402d73c850f045b70c46 (diff)
downloadfacter-97879f9f576484b54fde41326a87129a1fe4f8b6.tar.gz
facter-97879f9f576484b54fde41326a87129a1fe4f8b6.tar.xz
facter-97879f9f576484b54fde41326a87129a1fe4f8b6.zip
Added support for Slackware in operatingsystem and operatingsystemrelease
-rw-r--r--lib/facter/operatingsystem.rb2
-rw-r--r--lib/facter/operatingsystemrelease.rb10
2 files changed, 12 insertions, 0 deletions
diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb
index 335003a..d909fba 100644
--- a/lib/facter/operatingsystem.rb
+++ b/lib/facter/operatingsystem.rb
@@ -48,6 +48,8 @@ Facter.add(:operatingsystem) do
else
"SuSE"
end
+ elsif FileTest.exists?("/etc/slackware-version")
+ "Slackware"
end
end
end
diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb
index 358496a..91f40a7 100644
--- a/lib/facter/operatingsystemrelease.rb
+++ b/lib/facter/operatingsystemrelease.rb
@@ -60,5 +60,15 @@ Facter.add(:operatingsystemrelease) do
end
Facter.add(:operatingsystemrelease) do
+ confine :operatingsystem => %w{Slackware}
+ setcode do
+ release = Facter::Util::Resolution.exec('cat /etc/slackware-version')
+ if release =~ /Slackware ([0-9.]+)/
+ $1
+ end
+ end
+end
+
+Facter.add(:operatingsystemrelease) do
setcode do Facter[:kernelrelease].value end
end