X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/244ee49a37ae4f19dcc16d1f89eb265bb2cfd6ef..5159f6583109f402e3b51c528c81219bb6821110:/tools/actions/container_manager.py

diff --git a/tools/actions/container_manager.py b/tools/actions/container_manager.py
index bef7483..dd316c7 100644
--- a/tools/actions/container_manager.py
+++ b/tools/actions/container_manager.py
@@ -7,44 +7,13 @@ import time
 import glob
 import signal
 import sys
+import uuid
 import tools.config
 from tools import helpers
 from tools import services
 
 
 def start(args):
-    def make_prop(full_props_path):
-        def add_prop(key, cfg_key):
-            value = session_cfg["session"][cfg_key]
-            if value != "None":
-                value = value.replace("/mnt/", "/mnt_extra/")
-                props.append(key + "=" + value)
-
-        if not os.path.isfile(args.work + "/waydroid_base.prop"):
-            raise RuntimeError("waydroid_base.prop Not found")
-        with open(args.work + "/waydroid_base.prop") as f:
-            props = f.read().splitlines()
-        if not props:
-            raise RuntimeError("waydroid_base.prop is broken!!?")
-
-        add_prop("waydroid.host.user", "user_name")
-        add_prop("waydroid.host.uid", "user_id")
-        add_prop("waydroid.host.gid", "group_id")
-        add_prop("waydroid.xdg_runtime_dir", "xdg_runtime_dir")
-        add_prop("waydroid.pulse_runtime_path", "pulse_runtime_path")
-        add_prop("waydroid.wayland_display", "wayland_display")
-        if which("waydroid-sensord") is None:
-            props.append("waydroid.stub_sensors_hal=1")
-        dpi = session_cfg["session"]["lcd_density"]
-        if dpi != "0":
-            props.append("ro.sf.lcd_density=" + dpi)
-
-        final_props = open(full_props_path, "w")
-        for prop in props:
-            final_props.write(prop + "\n")
-        final_props.close()
-        os.chmod(full_props_path, 0o644)
-
     def set_permissions(perm_list=None, mode="777"):
         def chmod(path, mode):
             if os.path.exists(path):
@@ -69,6 +38,8 @@ def start(args):
                 # Graphics
                 "/dev/dri",
                 "/dev/graphics",
+                "/dev/pvr_sync",
+                "/dev/ion",
             ]
 
             # Framebuffers
@@ -91,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,
@@ -112,9 +82,6 @@ def start(args):
         
         # Load session configs
         session_cfg = tools.config.load_session()
-        
-        # Generate props
-        make_prop(args.work + "/waydroid.prop")
 
         # Networking
         command = [tools.config.tools_src +
@@ -122,12 +89,15 @@ def start(args):
         tools.helpers.run.user(args, command, check=False)
 
         # Sensors
-        tools.helpers.run.user(
-            args, ["waydroid-sensord", "/dev/" + args.HWBINDER_DRIVER], output="background")
+        if which("waydroid-sensord"):
+            tools.helpers.run.user(
+                args, ["waydroid-sensord", "/dev/" + args.HWBINDER_DRIVER], output="background")
 
         # Mount rootfs
         helpers.images.mount_rootfs(args, cfg["waydroid"]["images_path"])
 
+        helpers.protocol.set_aidl_version(args)
+
         # Mount data
         helpers.mount.bind(args, session_cfg["session"]["waydroid_data"],
                            tools.config.defaults["data"])
@@ -136,7 +106,9 @@ def start(args):
         if which("start"):
             command = ["start", "cgroup-lite"]
             tools.helpers.run.user(args, command, check=False)
-        helpers.mount.umount_all(args, "/sys/fs/cgroup/schedtune")
+        if os.path.ismount("/sys/fs/cgroup/schedtune"):
+            command = ["umount", "-l", "/sys/fs/cgroup/schedtune"]
+            tools.helpers.run.user(args, command, check=False)
 
         #TODO: remove NFC hacks
         if which("stop"):
@@ -202,11 +174,17 @@ def stop(args):
         # Sensors
         if which("waydroid-sensord"):
             command = ["pidof", "waydroid-sensord"]
-            pid = tools.helpers.run.user(args, command, check=False, output_return=True)
+            pid = tools.helpers.run.user(args, command, check=False, output_return=True).strip()
             if pid:
                 command = ["kill", "-9", pid]
                 tools.helpers.run.user(args, command, check=False)
 
+        # Umount rootfs
+        helpers.images.umount_rootfs(args)
+
+        # Umount data
+        helpers.mount.umount_all(args, tools.config.defaults["data"])
+
     else:
         logging.error("WayDroid container is {}".format(status))