diff options
| author | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-02-04 19:20:17 -0600 |
|---|---|---|
| committer | Wesley Wiedenmeier <wesley.wiedenmeier@gmail.com> | 2016-02-04 19:20:17 -0600 |
| commit | 2f2bd4232b3f51f571f76c30b715c215e5815703 (patch) | |
| tree | 086f68ab8efe1b6fac204be34fa26efe2ad60f9f /cloudinit/util.py | |
| parent | 1f24e50c655ccc0c49afcd3225ce8f0e0bce05b9 (diff) | |
| parent | 6b294286e0d0a1da6b24b338cae3b900a763e9d2 (diff) | |
| download | vyos-cloud-init-2f2bd4232b3f51f571f76c30b715c215e5815703.tar.gz vyos-cloud-init-2f2bd4232b3f51f571f76c30b715c215e5815703.zip | |
Merge from trunk and resolve text conflict in ChangeLog
Diffstat (limited to 'cloudinit/util.py')
| -rw-r--r-- | cloudinit/util.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/cloudinit/util.py b/cloudinit/util.py index 83c2c0d2..45d49e66 100644 --- a/cloudinit/util.py +++ b/cloudinit/util.py @@ -76,7 +76,9 @@ FALSE_STRINGS = ('off', '0', 'no', 'false') # Helper utils to see if running in a container -CONTAINER_TESTS = ('running-in-container', 'lxc-is-container') +CONTAINER_TESTS = (['systemd-detect-virt', '--quiet', '--container'], + ['running-in-container'], + ['lxc-is-container']) def decode_binary(blob, encoding='utf-8'): @@ -1749,7 +1751,7 @@ def is_container(): try: # try to run a helper program. if it returns true/zero # then we're inside a container. otherwise, no - subp([helper]) + subp(helper) return True except (IOError, OSError): pass |