diff -u facter-1.5.6/debian/changelog facter-1.5.6/debian/changelog --- facter-1.5.6/debian/changelog +++ facter-1.5.6/debian/changelog @@ -1,3 +1,10 @@ +facter (1.5.6-2ubuntu3) lucid; urgency=low + + * Cherry-picked KVM detection for 'virtual' fact from upstream commit + 62b6773a63bb96273fbc. (LP: #708080). + + -- Oliver Brakmann Wed, 26 Jan 2011 21:36:23 +0100 + facter (1.5.6-2ubuntu2) lucid; urgency=low * Dropped ruby-pkg-tools, and libsetup-ruby1.8, and cdbs, use what only in patch2: unchanged: --- facter-1.5.6.orig/lib/facter/virtual.rb +++ facter-1.5.6/lib/facter/virtual.rb @@ -46,7 +46,14 @@ result = "xen0" end end - + + if FileTest.exists?("/proc/cpuinfo") + txt = File.read("/proc/cpuinfo") + if txt =~ /QEMU Virtual CPU/ + result = "kvm" + end + end + if result == "physical" output = Facter::Util::Resolution.exec('lspci') if not output.nil? @@ -86,7 +93,7 @@ setcode do case Facter.value(:virtual) - when "xenu", "openvzve", "vmware" + when "xenu", "openvzve", "vmware", "kvm" true else false