YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #508 from Josue-T/patch-9

Browse source 
Fix container detection
This commit is contained in:
Bram 2018-07-23 06:58:28 +02:00 • committed by GitHub
commit cd88f98bf9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/yunohost/tools.py
View file

@ -234,14 +234,14 @@ def _is_inside_container():
Returns True or False Returns True or False
""" """
# See https://stackoverflow.com/a/37016302 # See https://www.2daygeek.com/check-linux-system-physical-virtual-machine-virtualization-technology/
p = subprocess.Popen("sudo cat /proc/1/sched".split(), p = subprocess.Popen("sudo systemd-detect-virt".split(),
stdout=subprocess.PIPE, stdout=subprocess.PIPE,
stderr=subprocess.STDOUT) stderr=subprocess.STDOUT)
out, _ = p.communicate() out, _ = p.communicate()
container = ['lxc','lxd','docker']
return out.split()[1] != "(1," return out.split()[0] in container
def tools_postinstall(domain, password, ignore_dyndns=False): def tools_postinstall(domain, password, ignore_dyndns=False):