Merge pull request #10357 from htgoebel/devel

Fix detect of docker as virtualization_type.
pull/10461/head
Toshio Kuratomi 10 years ago
commit 8c3b5690e5

@ -2383,7 +2383,7 @@ class LinuxVirtual(Virtual):
if os.path.exists('/proc/1/cgroup'): if os.path.exists('/proc/1/cgroup'):
for line in get_file_lines('/proc/1/cgroup'): for line in get_file_lines('/proc/1/cgroup'):
if re.search('/docker/', line): if re.search(r'/docker(/|-[0-9a-f]+\.scope)', line):
self.facts['virtualization_type'] = 'docker' self.facts['virtualization_type'] = 'docker'
self.facts['virtualization_role'] = 'guest' self.facts['virtualization_role'] = 'guest'
return return

Loading…
Cancel
Save