lxc: Provide all fb and video nodes to container

diff --git a/tools/actions/container_manager.py b/tools/actions/container_manager.py
index 520034d13db010df020ad374e8b6f5483fb7e54a..bef748362dd456b56a6238389d4f5be3271f0358 100644 (file)
--- a/tools/actions/container_manager.py
+++ b/tools/actions/container_manager.py
@@ -65,8 +65,6 @@ def start(args):
                 "/dev/MTK_SMI",
                 "/dev/mdp_sync",
                 "/dev/mtk_cmdq",
                 "/dev/MTK_SMI",
                 "/dev/mdp_sync",
                 "/dev/mtk_cmdq",

-                "/dev/video32",
-                "/dev/video33",

 
                 # Graphics
                 "/dev/dri",
 
                 # Graphics
                 "/dev/dri",


@@ -75,6 +73,8 @@ def start(args):
 
             # Framebuffers
             perm_list.extend(glob.glob("/dev/fb*"))
 
             # Framebuffers
             perm_list.extend(glob.glob("/dev/fb*"))

+            # Videos
+            perm_list.extend(glob.glob("/dev/video*"))

 
         for path in perm_list:
             chmod(path, mode)
 
         for path in perm_list:
             chmod(path, mode)

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index 578513bd1bb0e5da469b6360feb07bbf371d9603..531af808b702b3fc804b998b00a66f8953d82b8e 100644 (file)
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -49,15 +49,16 @@ def generate_nodes_lxc_config(args):
     make_entry("/dev/mali0")
     make_entry("/dev/pvr_sync")
     make_entry("/dev/pmsg0")
     make_entry("/dev/mali0")
     make_entry("/dev/pvr_sync")
     make_entry("/dev/pmsg0")

-    make_entry("/dev/fb0")
-    make_entry("/dev/graphics/fb0")
-    make_entry("/dev/fb1")
-    make_entry("/dev/graphics/fb1")
-    make_entry("/dev/fb2")
-    make_entry("/dev/graphics/fb2")

     make_entry("/dev/dxg")
     make_entry("/dev/dri", options="bind,create=dir,optional 0 0")
 
     make_entry("/dev/dxg")
     make_entry("/dev/dri", options="bind,create=dir,optional 0 0")
 

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

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


@@ -96,10 +97,6 @@ def generate_nodes_lxc_config(args):
     make_entry("/dev/mdp_sync")
     make_entry("/dev/mtk_cmdq")
 
     make_entry("/dev/mdp_sync")
     make_entry("/dev/mtk_cmdq")
 

-    # Media dev nodes (for Qcom)
-    make_entry("/dev/video32")
-    make_entry("/dev/video33")
-

     # WSLg
     make_entry("tmpfs", "mnt_extra", "tmpfs", "nodev 0 0", False)
     make_entry("/mnt/wslg", "mnt_extra/wslg",
     # WSLg
     make_entry("tmpfs", "mnt_extra", "tmpfs", "nodev 0 0", False)
     make_entry("/mnt/wslg", "mnt_extra/wslg",