container: Umount on stop

[waydroid.git] / tools / helpers / drivers.py

diff --git a/tools/helpers/drivers.py b/tools/helpers/drivers.py
index e5a0335474e3a31c8c3aa45a00cac2d4494b2fe8..f5a5b118e7cb0c8f3c449c18df6d3619fa4e0255 100644 (file)
--- a/tools/helpers/drivers.py
+++ b/tools/helpers/drivers.py
@@ -23,6 +23,16 @@ HWBINDER_DRIVERS = [
     "hwbinder"
 ]
 
+
+def isBinderfsLoaded(args):
+    with open("/proc/filesystems", "r") as handle:
+        for line in handle:
+            words = line.split()
+            if len(words) >= 2 and words[1] == "binder":
+                return True
+
+    return False
+
 def probeBinderDriver(args):
     binder_dev_nodes = []
     has_binder = False
@@ -45,24 +55,24 @@ def probeBinderDriver(args):
         binder_dev_nodes.append(HWBINDER_DRIVERS[0])
 
     if len(binder_dev_nodes) > 0:
-        devices = ','.join(binder_dev_nodes)
-        command = ["modprobe", "binder_linux", "devices=\"{}\"".format(devices)]
-        output = tools.helpers.run.root(args, command, check=False, output_return=True)
-        if output:
-            logging.error("Failed to load binder driver for devices: {}".format(devices))
-            logging.error(output.strip())
-        else:
+        if not isBinderfsLoaded(args):
+            devices = ','.join(binder_dev_nodes)
+            command = ["modprobe", "binder_linux", "devices=\"{}\"".format(devices)]
+            output = tools.helpers.run.user(args, command, check=False, output_return=True)
+            if output:
+                logging.error("Failed to load binder driver for devices: {}".format(devices))
+                logging.error(output.strip())
+
+        if isBinderfsLoaded(args):
             command = ["mkdir", "-p", "/dev/binderfs"]
-            tools.helpers.run.root(args, command, check=False)
+            tools.helpers.run.user(args, command, check=False)
             command = ["mount", "-t", "binder", "binder", "/dev/binderfs"]
-            tools.helpers.run.root(args, command, check=False)
+            tools.helpers.run.user(args, command, check=False)
             command = ["ln", "-s"]
             command.extend(glob.glob("/dev/binderfs/*"))
             command.append("/dev/")
-            tools.helpers.run.root(args, command, check=False)
-
-    for node in binder_dev_nodes:
-        if not os.path.exists("/dev/" + node):
+            tools.helpers.run.user(args, command, check=False)
+        else: 
             return -1
 
     return 0
@@ -70,7 +80,7 @@ def probeBinderDriver(args):
 def probeAshmemDriver(args):
     if not os.path.exists("/dev/ashmem"):
         command = ["modprobe", "ashmem_linux"]
-        output = tools.helpers.run.root(args, command, check=False, output_return=True)
+        output = tools.helpers.run.user(args, command, check=False, output_return=True)
         if output:
             logging.error("Failed to load ashmem driver")
             logging.error(output.strip())