diff options
| author | James Turnbull <james@lovedthanlost.net> | 2011-03-07 11:16:44 +1100 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2011-03-07 11:51:18 +1100 |
| commit | 7dd730d4cd7aebf0552647632e709570f15831ec (patch) | |
| tree | b2fa2b88b836e05355cc59a7681774d317a9cbff /lib | |
| parent | 49febe4fb55f35bff84dddc586e71fa0a74bc48b (diff) | |
| download | facter-7dd730d4cd7aebf0552647632e709570f15831ec.tar.gz facter-7dd730d4cd7aebf0552647632e709570f15831ec.tar.xz facter-7dd730d4cd7aebf0552647632e709570f15831ec.zip | |
Fixed #5699 - Added virtual support for s390x/Zlinux
Patch modified from Hector Rivas
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/facter/util/virtual.rb | 3 | ||||
| -rw-r--r-- | lib/facter/virtual.rb | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/lib/facter/util/virtual.rb b/lib/facter/util/virtual.rb index 06b1b6d..4355451 100644 --- a/lib/facter/util/virtual.rb +++ b/lib/facter/util/virtual.rb @@ -70,4 +70,7 @@ module Facter::Util::Virtual Facter::Util::Resolution.exec("/usr/bin/getconf MACHINE_MODEL").chomp =~ /Virtual Machine/ end + def self.zlinux? + "zlinux" + end end diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb index 47c9504..a5954cd 100644 --- a/lib/facter/virtual.rb +++ b/lib/facter/virtual.rb @@ -31,6 +31,10 @@ Facter.add("virtual") do result = "hpvm" if Facter::Util::Virtual.hpvm? end + if Facter.value(:architecture)=="s390x" + result = "zlinux" if Facter::Util::Virtual.zlinux? + end + if Facter::Util::Virtual.openvz? result = Facter::Util::Virtual.openvz_type() end |