]> glassweightruler.freedombox.rocks Git - waydroid.git/commitdiff
Quiet ashmem modprobe errors
authorAlessandro Astone <ales.astone@gmail.com>
Thu, 8 Sep 2022 07:32:11 +0000 (09:32 +0200)
committerAlessandro Astone <ales.astone@gmail.com>
Fri, 9 Sep 2022 15:27:19 +0000 (17:27 +0200)
tools/actions/container_manager.py
tools/helpers/drivers.py

index 8b91b451f085b31b99440c96123966e967eee110..dd316c7d18c55f24f33ed965214473c6d6ace4a5 100644 (file)
@@ -62,8 +62,7 @@ def start(args):
         if cfg["waydroid"]["vendor_type"] == "MAINLINE":
             if helpers.drivers.probeBinderDriver(args) != 0:
                 logging.error("Failed to load Binder driver")
-            if helpers.drivers.probeAshmemDriver(args) != 0:
-                logging.error("Failed to load Ashmem driver")
+            helpers.drivers.probeAshmemDriver(args)
         helpers.drivers.loadBinderNodes(args)
         set_permissions([
             "/dev/" + args.BINDER_DRIVER,
index b04877d6577e1ab489f3609653f6aaeb77e2af4f..3c0ea7a987efdd019655581cc45f8942a34f0e34 100644 (file)
@@ -112,11 +112,8 @@ def probeBinderDriver(args):
 
 def probeAshmemDriver(args):
     if not os.path.exists("/dev/ashmem"):
-        command = ["modprobe", "ashmem_linux"]
-        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())
+        command = ["modprobe", "-q", "ashmem_linux"]
+        tools.helpers.run.user(args, command, check=False)
 
     if not os.path.exists("/dev/ashmem"):
         return -1