From: Alessandro Astone <ales.astone@gmail.com>
Date: Thu, 8 Sep 2022 07:32:11 +0000 (+0200)
Subject: Quiet ashmem modprobe errors
X-Git-Tag: 1.3.2~2
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/5159f6583109f402e3b51c528c81219bb6821110?ds=inline

Quiet ashmem modprobe errors
---

diff --git a/tools/actions/container_manager.py b/tools/actions/container_manager.py
index 8b91b45..dd316c7 100644
--- a/tools/actions/container_manager.py
+++ b/tools/actions/container_manager.py
@@ -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,
diff --git a/tools/helpers/drivers.py b/tools/helpers/drivers.py
index b04877d..3c0ea7a 100644
--- a/tools/helpers/drivers.py
+++ b/tools/helpers/drivers.py
@@ -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