From: Nbiba Bedis <bedisnbiba@gmail.com>
Date: Thu, 30 Sep 2021 20:53:55 +0000 (+0100)
Subject: container: don't panic if binder device already exists
X-Git-Tag: 1.2.0~19
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/efb14422c53623aa8edf0ae432d1ebca9b3b82a0?ds=sidebyside

container: don't panic if binder device already exists
---

diff --git a/tools/helpers/drivers.py b/tools/helpers/drivers.py
index 31005a5..25a5b62 100644
--- a/tools/helpers/drivers.py
+++ b/tools/helpers/drivers.py
@@ -58,7 +58,10 @@ def allocBinderNodes(args, binder_dev_nodes):
     for node in binder_dev_nodes:
         node_struct = struct.pack(
             '256sII', bytes(node, 'utf-8'), 0, 0)
-        fcntl.ioctl(binderctrlfd.fileno(), BINDER_CTL_ADD, node_struct)
+        try:
+            fcntl.ioctl(binderctrlfd.fileno(), BINDER_CTL_ADD, node_struct)
+        except FileExistsError:
+            pass
 
 def probeBinderDriver(args):
     binder_dev_nodes = []