commit 4ae92b846b45ac9ef02e9d19b5d9ddcb4ac05bf3
author Julian Edwards <bigjools@gmail.com> Thu Mar 16 09:01:39 2017 +1000
committer Julian Edwards <bigjools@gmail.com> Sat Mar 18 11:45:16 2017 +1000
tree 910cdd1903f4e215ef60ed45cfa52b58e1f0c94e
parent 27b1b21f016ae784e1db7309a45630c98f68eb63

Make running_in_container work in more containers

Instead of grepping for 'lxc' in /proc/1/cgroup, use systemd's
features. This now at least also works in LXD containers.

Change-Id: I35e807c26f0b1fbba83ddbe04cfb4901a7a95cbe

functions

diff --git a/functions b/functions
index 1aa7517..4435f2d 100644
--- a/functions
+++ b/functions
@@ -666,7 +666,7 @@
 
 # running_in_container - Returns true otherwise false
 function running_in_container {
-    if grep -q lxc /proc/1/cgroup; then
+    if [[ $(systemd-detect-virt --container) == 'none' ]]; then
         return 0
     fi