Please review pull request #164: fix xen0/xenu detection: https://projects.puppetlabs.com/issues/10625 opened by (heffergm)
Description:
- Opened: Wed Feb 01 23:44:03 UTC 2012
- Based on: puppetlabs:master (53fdf98c4794719e1104e5767cd195ec4ae53429)
- Requested merge: heffergm:virtual_detection (976b7af24d641e589121d30e37bacc983d79cc0a)
Diff follows:
diff --git a/lib/facter/virtual.rb b/lib/facter/virtual.rb
index 1ee41f9..d0c0d9a 100644
--- a/lib/facter/virtual.rb
+++ b/lib/facter/virtual.rb
@@ -73,9 +73,9 @@
end
if Facter::Util::Virtual.xen?
- if FileTest.exists?("/proc/xen/xsd_kva")
+ if FileTest.exists?("/dev/xen/evtchn")
result = "xen0"
- elsif FileTest.exists?("/proc/xen/capabilities")
+ elsif FileTest.exists?("/proc/xen")
result = "xenu"
end
end
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
