From 40b0471e959ba98b8f50385da0960063023248f6 Mon Sep 17 00:00:00 2001 From: Maciej Delmanowski Date: Mon, 23 Sep 2013 12:15:33 +0200 Subject: [PATCH 1/2] Add Linux Container identification --- library/system/setup | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/library/system/setup b/library/system/setup index 6b5a53e4f6..80cab6ee65 100755 --- a/library/system/setup +++ b/library/system/setup @@ -1899,6 +1899,13 @@ class LinuxVirtual(Virtual): self.facts['virtualization_role'] = 'guest' return + if os.path.exists('/proc/1/cgroup'): + for line in open('/proc/1/cgroup').readlines(): + if re.search('/lxc/.*$', line): + self.facts['virtualization_type'] = 'lxc' + self.facts['virtualization_role'] = 'guest' + return + product_name = get_file_content('/sys/devices/virtual/dmi/id/product_name') if product_name in ['KVM', 'Bochs']: From 551b93c54761aa780f8c92170b182b47361d9c60 Mon Sep 17 00:00:00 2001 From: Maciej Delmanowski Date: Mon, 23 Sep 2013 12:27:14 +0200 Subject: [PATCH 2/2] Made re.search string shorter --- library/system/setup | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/system/setup b/library/system/setup index 80cab6ee65..f9f08ce79d 100755 --- a/library/system/setup +++ b/library/system/setup @@ -1901,7 +1901,7 @@ class LinuxVirtual(Virtual): if os.path.exists('/proc/1/cgroup'): for line in open('/proc/1/cgroup').readlines(): - if re.search('/lxc/.*$', line): + if re.search('/lxc/', line): self.facts['virtualization_type'] = 'lxc' self.facts['virtualization_role'] = 'guest' return