virtualization-vserver.patch

   1 --- ohai-6.16.0/lib/ohai/plugins/linux/virtualization.rb~       2013-01-17 21:03:16.000000000 +0200
   2 +++ ohai-6.16.0/lib/ohai/plugins/linux/virtualization.rb        2013-05-25 20:52:31.871480338 +0300
   3 @@ -23,6 +23,20 @@
   4  # if it is possible to detect paravirt vs hardware virt, it should be put in
   5  # virtualization[:mechanism]
   6
   7 +# Detect Linux-VServer
   8 +if File.exists?("/proc/self/status")
   9 +  proc_self_status = File.read("/proc/self/status")
  10 +  vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/)
  11 +  if vxid and vxid[2]
  12 +    virtualization[:system] = "linux-vserver"
  13 +    if vxid[2] == "0"
  14 +      virtualization[:role] = "host"
  15 +    else
  16 +      virtualization[:role] = "guest"
  17 +     end
  18 +  end
  19 +end
  20 +
  21  ## Xen
  22  # /proc/xen is an empty dir for EL6 + Linode Guests
  23  if File.exists?("/proc/xen")
  24 @@ -109,17 +123,3 @@
  25
  26    end
  27  end
  28 -
  29 -# Detect Linux-VServer
  30 -if File.exists?("/proc/self/status")
  31 -  proc_self_status = File.read("/proc/self/status")
  32 -  vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/)
  33 -  if vxid and vxid[2]
  34 -    virtualization[:system] = "linux-vserver"
  35 -    if vxid[2] == "0"
  36 -      virtualization[:role] = "host"
  37 -    else
  38 -      virtualization[:role] = "guest"
  39 -     end
  40 -  end
  41 -end