ohai 0.6.6.rc.0 → 0.6.6.rc.1

data/lib/ohai/plugins/linux/virtualization.rb

@@ -22,11 +22,12 @@ virtualization Mash.new
 
 # if it is possible to detect paravirt vs hardware virt, it should be put in
 # virtualization[:mechanism]
-if File.exists?("/proc/xen/capabilities")
-  virtualization[:system] = "xen"
-  if File.read("/proc/xen/capabilities") =~ /control_d/i
+if File.exists?("/proc/xen")
+  if File.exists?("/dev/xen/evtchn")
+    virtualization[:system] = "xen"
     virtualization[:role] = "host"
   else
+    virtualization[:system] = "xen"
     virtualization[:role] = "guest"
   end
 end

data/lib/ohai/version.rb

@@ -18,6 +18,6 @@
 
 module Ohai
   OHAI_ROOT = File.expand_path(File.dirname(__FILE__))
-  VERSION = '0.6.6.rc.0'
+  VERSION = '0.6.6.rc.1'
 end
 

data/spec/ohai/plugins/linux/virtualization_spec.rb

@@ -26,26 +26,27 @@ describe Ohai::System, "Linux virtualization platform" do
     @ohai.extend(SimpleFromFile)
 
     # default to all requested Files not existing
-    File.stub!(:exists?).with("/proc/xen/capabilities").and_return(false)
+    File.stub(:exists?).with("/proc/xen").and_return(false)
+    File.stub(:exists?).with("/dev/xen/evtchn").and_return(false)
     File.stub!(:exists?).with("/proc/modules").and_return(false)
     File.stub!(:exists?).with("/proc/cpuinfo").and_return(false)
     File.stub!(:exists?).with("/usr/sbin/dmidecode").and_return(false)
     File.stub!(:exists?).with("/proc/self/status").and_return(false)
-		File.stub!(:exists?).with("/proc/user_beancounters").and_return(false)
+    File.stub!(:exists?).with("/proc/user_beancounters").and_return(false)
   end
 
   describe "when we are checking for xen" do
-    it "should set xen host if /proc/xen/capabilities contains control_d" do
-      File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(true)
-      File.stub!(:read).with("/proc/xen/capabilities").and_return("control_d")
+    it "should set xen host if /proc/xen " do
+      File.should_receive(:exists?).with("/proc/xen").and_return(true)
+      File.should_receive(:exists?).with("/dev/xen/evtchn").and_return(true)
       @ohai._require_plugin("linux::virtualization")
       @ohai[:virtualization][:system].should == "xen"
       @ohai[:virtualization][:role].should == "host"
     end
 
-    it "should set xen guest if /proc/xen/capabilities exists" do
-      File.should_receive(:exists?).with("/proc/xen/capabilities").and_return(true)
-      File.stub!(:read).with("/proc/xen/capabilities").and_return("")
+    it "should set xen guest if no /dev/xen/evtchn" do
+      File.should_receive(:exists?).with("/proc/xen").and_return(true)
+      File.should_receive(:exists?).with("/dev/xen/evtchn").and_return(false)
       @ohai._require_plugin("linux::virtualization")
       @ohai[:virtualization][:system].should == "xen"
       @ohai[:virtualization][:role].should == "guest"

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: ohai
 version: !ruby/object:Gem::Version 
-  hash: 15424069
+  hash: 15424071
   prerelease: 6
   segments: 
   - 0
   - 6
   - 6
   - rc
-  - 0
-  version: 0.6.6.rc.0
+  - 1
+  version: 0.6.6.rc.1
 platform: ruby
 authors: 
 - Adam Jacob
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-21 00:00:00 Z
+date: 2011-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: yajl-ruby