Handle unreadable /proc/xen/capabilities

Fixes #1854.
reviewable/pr18780/r1
Daniel Hokka Zakrisson 12 years ago
parent 74679a5f4b
commit 360701ea43

@ -713,10 +713,12 @@ class LinuxVirtual(Virtual):
if os.path.exists("/proc/xen"): if os.path.exists("/proc/xen"):
self.facts['virtualization_type'] = 'xen' self.facts['virtualization_type'] = 'xen'
self.facts['virtualization_role'] = 'guest' self.facts['virtualization_role'] = 'guest'
if os.path.exists('/proc/xen/capabilities'): try:
for line in open('/proc/xen/capabilities'): for line in open('/proc/xen/capabilities'):
if "control_d" in line: if "control_d" in line:
self.facts['virtualization_role'] = 'host' self.facts['virtualization_role'] = 'host'
except IOError:
pass
return return
if os.path.exists('/proc/vz'): if os.path.exists('/proc/vz'):

Loading…
Cancel
Save