Remove unused python imports

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

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index c2ca4e7bf77fc1f127ddd88cfd3859ad08c3edcb..049c304175c6b61bf8ab6e29d0009f3a6daf253e 100644 (file)
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -2,7 +2,6 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 import subprocess
 import os
 # SPDX-License-Identifier: GPL-3.0-or-later
 import subprocess
 import os

-import re

 import logging
 import glob
 import shutil
 import logging
 import glob
 import shutil


@@ -55,9 +54,8 @@ def generate_nodes_lxc_config(args):
     make_entry("/dev/pvr_sync")
     make_entry("/dev/pmsg0")
     make_entry("/dev/dxg")
     make_entry("/dev/pvr_sync")
     make_entry("/dev/pmsg0")
     make_entry("/dev/dxg")

-    render, card = tools.helpers.gpu.getDriNode(args)
-    make_entry(render, "dev/dri/renderD128")
-    make_entry(card, "dev/dri/card0")
+    render, _ = tools.helpers.gpu.getDriNode(args)
+    make_entry(render)

 
     for n in glob.glob("/dev/fb*"):
         make_entry(n)
 
     for n in glob.glob("/dev/fb*"):
         make_entry(n)


@@ -65,6 +63,8 @@ def generate_nodes_lxc_config(args):
         make_entry(n)
     for n in glob.glob("/dev/video*"):
         make_entry(n)
         make_entry(n)
     for n in glob.glob("/dev/video*"):
         make_entry(n)

+    for n in glob.glob("/dev/dma_heap/*"):
+        make_entry(n)

 
     # Binder dev nodes
     make_entry("/dev/" + args.BINDER_DRIVER, "dev/binder", check=False)
 
     # Binder dev nodes
     make_entry("/dev/" + args.BINDER_DRIVER, "dev/binder", check=False)


@@ -258,6 +258,7 @@ def make_base_props(args):
         if dri:
             gralloc = "gbm"
             egl = "mesa"
         if dri:
             gralloc = "gbm"
             egl = "mesa"

+            props.append("gralloc.gbm.device=" + dri)

         else:
             gralloc = "default"
             egl = "swiftshader"
         else:
             gralloc = "default"
             egl = "swiftshader"


@@ -473,7 +474,12 @@ def shell(args):
         command.extend(args.COMMAND)
     else:
         command.append("/system/bin/sh")
         command.extend(args.COMMAND)
     else:
         command.append("/system/bin/sh")

-    subprocess.run(command)
+
+    try:
+        subprocess.run(command)
+    except KeyboardInterrupt:
+        pass
+

     if state == "FROZEN":
         freeze(args)
 
     if state == "FROZEN":
         freeze(args)