diff options
author | James Turnbull <james@lovedthanlost.net> | 2008-09-05 10:22:23 +1000 |
---|---|---|
committer | James Turnbull <james@lovedthanlost.net> | 2008-09-05 10:23:57 +1000 |
commit | 0fac7040920a9d820f656ce3f121ae2f342df8e4 (patch) | |
tree | 888f37302678db7d395a6d9c6f12f866a1108dc9 | |
parent | 5c50bc35fe12b36b3c2482d9d149d09d253e2f45 (diff) | |
download | facter-0fac7040920a9d820f656ce3f121ae2f342df8e4.tar.gz facter-0fac7040920a9d820f656ce3f121ae2f342df8e4.tar.xz facter-0fac7040920a9d820f656ce3f121ae2f342df8e4.zip |
Fixed #1558 - Updated virtual fact for xenu and xen0
-rw-r--r-- | CHANGELOG | 6 | ||||
-rw-r--r-- | lib/facter/virtual.rb | 6 |
2 files changed, 7 insertions, 5 deletions
@@ -1,7 +1,9 @@ 1.5.2: - Fixed #1555 - added operatingsystemrelease for Solaris + Fixed #1558 - Updated virtual fact for xenu and xen0 - Fixed #1559 - update to dmidecode fact + Fixed #1555 - Ddded operatingsystemrelease for Solaris + + Fixed #1559 - Update to dmidecode fact 1.5.1: Added a Process.waitall thread when there's a timeout, to avoid zombies. diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb index d84397d..46d76b8 100644 --- a/lib/facter/virtual.rb +++ b/lib/facter/virtual.rb @@ -11,12 +11,12 @@ Facter.add("virtual") do result = "openvz" end - if FileTest.exists?("/proc/sys/xen/independent_wallclock") - result = "xenu" - elsif FileTest.exists?("/proc/xen/capabilities") + if FileTest.exists?("/proc/xen/capabilities") txt = File.read("/proc/xen/capabilities") if txt =~ /control_d/i result = "xen0" + else + result = "xenu" end end |