summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorJames Turnbull <james@lovedthanlost.net>2011-03-12 03:27:17 +1100
committerJames Turnbull <james@lovedthanlost.net>2011-03-12 03:27:17 +1100
commitb0dfec79a5861300db078925464cd5100e074338 (patch)
tree869ac7bcd766bf3410b22ca7b009f69ba7ac2fdf /lib
parentdea6f78ace56df3459dd182300cc9618df712317 (diff)
parentd718af449fc30585fcc672861077ec9045a4ef03 (diff)
downloadfacter-b0dfec79a5861300db078925464cd5100e074338.tar.gz
facter-b0dfec79a5861300db078925464cd5100e074338.tar.xz
facter-b0dfec79a5861300db078925464cd5100e074338.zip
Merge branch 'ticket/master/6679' into next
Diffstat (limited to 'lib')
-rw-r--r--lib/facter/operatingsystem.rb2
1 files changed, 2 insertions, 0 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