summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-03-11 11:51:43 +1100
committerJames Turnbull <james@lovedthanlost.net>2011-03-11 11:51:43 +1100
commitd718af449fc30585fcc672861077ec9045a4ef03 (patch)
tree4cceaed252736628f219fed28afc2b56a4da543a
parent469d2a26a467c50af9f9732d7f98e8a01ecc369f (diff)
downloadfacter-d718af449fc30585fcc672861077ec9045a4ef03.tar.gz
facter-d718af449fc30585fcc672861077ec9045a4ef03.tar.xz
facter-d718af449fc30585fcc672861077ec9045a4ef03.zip
Fix #6679 - Added Scientific Linux to operatingsystem fact
Thanks to James Goddard for the patch
-rw-r--r--lib/facter/operatingsystem.rb2
-rwxr-xr-xspec/unit/operatingsystem_spec.rb12
2 files changed, 8 insertions, 6 deletions
diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb
index c5a3dc1..bda8ba3 100644
--- a/lib/facter/operatingsystem.rb
+++ b/lib/facter/operatingsystem.rb
@@ -36,6 +36,8 @@ Facter.add(:operatingsystem) do
txt = File.read("/etc/redhat-release")
if txt =~ /centos/i
"CentOS"
+ elsif txt =~ /scientific/i
+ "Scientific"
else
"RedHat"
end
diff --git a/spec/unit/operatingsystem_spec.rb b/spec/unit/operatingsystem_spec.rb
index be83916..73b3649 100755
--- a/spec/unit/operatingsystem_spec.rb
+++ b/spec/unit/operatingsystem_spec.rb
@@ -9,23 +9,23 @@ describe "Operating System fact" do
before do
Facter.clear
end
-
+
after do
Facter.clear
end
-
+
it "should default to the kernel name" do
Facter.fact(:kernel).stubs(:value).returns("Nutmeg")
Facter.fact(:operatingsystem).value.should == "Nutmeg"
end
-
+
it "should be Solaris for SunOS" do
Facter.fact(:kernel).stubs(:value).returns("SunOS")
-
+
Facter.fact(:operatingsystem).value.should == "Solaris"
end
-
+
it "should identify Oracle VM as OVS" do
Facter.fact(:kernel).stubs(:value).returns("Linux")
@@ -33,7 +33,7 @@ describe "Operating System fact" do
FileTest.expects(:exists?).with("/etc/ovs-release").returns true
FileTest.expects(:exists?).with("/etc/enterprise-release").returns true
-
+
Facter.fact(:operatingsystem).value.should == "OVS"
end
end