diff options
| author | Nabeel Shahzad <nshahzad@gmail.com> | 2014-09-11 16:45:19 -0400 |
|---|---|---|
| committer | Nabeel Shahzad <nshahzad@gmail.com> | 2014-09-11 16:45:19 -0400 |
| commit | db0ffb098f9c434ac4d1acc7591adb006ee69116 (patch) | |
| tree | 33663261a06d55fd2ef92ef7bbb97d705719dcd9 | |
| parent | 35dc3d5010dc6392f8fbb7f389534e47c0e0427a (diff) | |
| download | ohai-db0ffb098f9c434ac4d1acc7591adb006ee69116.tar.gz | |
Look for any number of spaces between the VxID and the value
Seems like some vservers have inconsistent formatting here and thus the virtualization is not accurately detected
| -rw-r--r-- | lib/ohai/plugins/linux/virtualization.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ohai/plugins/linux/virtualization.rb b/lib/ohai/plugins/linux/virtualization.rb index 49d01565..6a9c9fa2 100644 --- a/lib/ohai/plugins/linux/virtualization.rb +++ b/lib/ohai/plugins/linux/virtualization.rb @@ -137,7 +137,7 @@ Ohai.plugin(:Virtualization) do # Detect Linux-VServer if File.exists?("/proc/self/status") proc_self_status = File.read("/proc/self/status") - vxid = proc_self_status.match(/^(s_context|VxID): (\d+)$/) + vxid = proc_self_status.match(/^(s_context|VxID): *(\d+)$/) if vxid and vxid[2] virtualization[:system] = "linux-vserver" if vxid[2] == "0" |