summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRein Henrichs <rein@puppetlabs.com>2010-08-03 17:05:04 -0700
committerRein Henrichs <rein@puppetlabs.com>2010-08-03 17:05:04 -0700
commit67f6604e96f04f07fea1a452ae6a19f1d158405d (patch)
tree73593be7e34a896fd6e23c0885009a4023ef30db
parent2b13972db449e4934b07c49cbea33b0840163255 (diff)
downloadfacter-67f6604e96f04f07fea1a452ae6a19f1d158405d.tar.gz
facter-67f6604e96f04f07fea1a452ae6a19f1d158405d.tar.xz
facter-67f6604e96f04f07fea1a452ae6a19f1d158405d.zip
[#4062] Implement operating system facts for MeeGo
Implements operatingsystem and operatingsystemrelease for MeeGo From Rohan McGovern's patch: MeeGo ( http://meego.com/ ) uses an /etc/meego-release file similar to the files found on many Linux distros. Currently, MeeGo falls back on “Linux” as the operatingsystem fact. It’d be useful to have a proper value. Attached patch implements it. Signed-off-by: Rein Henrichs <rein@puppetlabs.com>
-rw-r--r--lib/facter/operatingsystem.rb2
-rw-r--r--lib/facter/operatingsystemrelease.rb4
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/facter/operatingsystem.rb b/lib/facter/operatingsystem.rb
index d909fba..c5a3dc1 100644
--- a/lib/facter/operatingsystem.rb
+++ b/lib/facter/operatingsystem.rb
@@ -20,6 +20,8 @@ Facter.add(:operatingsystem) do
"Mandriva"
elsif FileTest.exists?("/etc/mandrake-release")
"Mandrake"
+ elsif FileTest.exists?("/etc/meego-release")
+ "MeeGo"
elsif FileTest.exists?("/etc/arch-release")
"Archlinux"
elsif FileTest.exists?("/etc/enterprise-release")
diff --git a/lib/facter/operatingsystemrelease.rb b/lib/facter/operatingsystemrelease.rb
index 91f40a7..30f2989 100644
--- a/lib/facter/operatingsystemrelease.rb
+++ b/lib/facter/operatingsystemrelease.rb
@@ -1,11 +1,13 @@
Facter.add(:operatingsystemrelease) do
- confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat}
+ confine :operatingsystem => %w{CentOS Fedora oel ovs RedHat MeeGo}
setcode do
case Facter.value(:operatingsystem)
when "CentOS", "RedHat"
releasefile = "/etc/redhat-release"
when "Fedora"
releasefile = "/etc/fedora-release"
+ when "MeeGo"
+ releasefile = "/etc/meego-release"
when "OEL"
releasefile = "/etc/enterprise-release"
when "OVS"