lxc: Provide /var/run to container

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

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index 8ed65a9b8e5ba3c80882cc9d7a1a83091716c3ab..578513bd1bb0e5da469b6360feb07bbf371d9603 100644 (file)
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -55,6 +55,7 @@ def generate_nodes_lxc_config(args):
     make_entry("/dev/graphics/fb1")
     make_entry("/dev/fb2")
     make_entry("/dev/graphics/fb2")
     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")
 
     # Binder dev nodes
     make_entry("/dev/dri", options="bind,create=dir,optional 0 0")
 
     # Binder dev nodes


@@ -99,6 +100,15 @@ def generate_nodes_lxc_config(args):
     make_entry("/dev/video32")
     make_entry("/dev/video33")
 
     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",
+               options="rbind,create=dir,optional 0 0")
+
+    # var
+    make_entry("tmpfs", "var", "tmpfs", "nodev 0 0", False)
+    make_entry("/var/run", options="rbind,create=dir,optional 0 0")
+

     return nodes
 
 
     return nodes
 
 


@@ -155,14 +165,19 @@ def make_base_props(args):
         return ""
 
     props = []
         return ""
 
     props = []

+    egl = tools.helpers.props.host_get(args, "ro.hardware.egl")
+

     gralloc = find_hal("gralloc")
     if gralloc == "":
     gralloc = find_hal("gralloc")
     if gralloc == "":

-        gralloc = "gbm"
-        props.append("ro.hardware.egl=mesa")
+        if os.path.exists("/dev/dri"):
+            gralloc = "gbm"
+            egl = "mesa"
+        else:
+            gralloc = "default"
+            egl = "swiftshader"

         props.append("debug.stagefright.ccodec=0")
     props.append("ro.hardware.gralloc=" + gralloc)
 
         props.append("debug.stagefright.ccodec=0")
     props.append("ro.hardware.gralloc=" + gralloc)
 

-    egl = tools.helpers.props.host_get(args, "ro.hardware.egl")

     if egl != "":
         props.append("ro.hardware.egl=" + egl)
 
     if egl != "":
         props.append("ro.hardware.egl=" + egl)