upgrade: Fallback to stopping container manually

[waydroid.git] / tools / actions / container_manager.py

diff --git a/tools/actions/container_manager.py b/tools/actions/container_manager.py
index 38b0040b92e07eee15a14b1af18545b1f7173c2f..e537e1843a7eb715d36ecbe004c3f44cc258fcde 100644 (file)
--- a/tools/actions/container_manager.py
+++ b/tools/actions/container_manager.py
@@ -24,11 +24,10 @@ class DbusContainerManager(dbus.service.Object):
 
     @dbus.service.method("id.waydro.ContainerManager", in_signature='a{ss}', out_signature='', sender_keyword="sender", connection_keyword="conn")
     def Start(self, session, sender, conn):
 
     @dbus.service.method("id.waydro.ContainerManager", in_signature='a{ss}', out_signature='', sender_keyword="sender", connection_keyword="conn")
     def Start(self, session, sender, conn):

-        if session["user_id"] != "0":
-            dbus_info = dbus.Interface(conn.get_object("org.freedesktop.DBus", "/org/freedesktop/DBus/Bus", False), "org.freedesktop.DBus")
-            uid = dbus_info.GetConnectionUnixUser(sender)
-            if str(uid) != session["user_id"]:
-                raise RuntimeError("Cannot start a session on behalf of another user")
+        dbus_info = dbus.Interface(conn.get_object("org.freedesktop.DBus", "/org/freedesktop/DBus/Bus", False), "org.freedesktop.DBus")
+        uid = dbus_info.GetConnectionUnixUser(sender)
+        if str(uid) not in ["0", session["user_id"]]:
+            raise RuntimeError("Cannot start a session on behalf of another user")

         do_start(self.args, session)
 
     @dbus.service.method("id.waydro.ContainerManager", in_signature='b', out_signature='')
         do_start(self.args, session)
 
     @dbus.service.method("id.waydro.ContainerManager", in_signature='b', out_signature='')


@@ -146,10 +145,6 @@ def do_start(args, session):
 
     helpers.protocol.set_aidl_version(args)
 
 
     helpers.protocol.set_aidl_version(args)
 

-    # Mount data
-    helpers.mount.bind(args, session["waydroid_data"],
-                       tools.config.defaults["data"])
-

     # Cgroup hacks
     if which("start"):
         command = ["start", "cgroup-lite"]
     # Cgroup hacks
     if which("start"):
         command = ["start", "cgroup-lite"]


@@ -166,6 +161,14 @@ def do_start(args, session):
     # Set permissions
     set_permissions(args)
 
     # Set permissions
     set_permissions(args)
 

+    # Create session-specific LXC config file
+    helpers.lxc.generate_session_lxc_config(args, session)
+    # Backwards compatibility
+    with open(tools.config.defaults["lxc"] + "/waydroid/config") as f:
+        if "config_session" not in f.read():
+            helpers.mount.bind(args, session["waydroid_data"],
+                               tools.config.defaults["data"])
+

     helpers.lxc.start(args)
     services.hardware_manager.start(args)
 
     helpers.lxc.start(args)
     services.hardware_manager.start(args)
 


@@ -201,8 +204,11 @@ def stop(args, quit_session=True):
         # Umount rootfs
         helpers.images.umount_rootfs(args)
 
         # Umount rootfs
         helpers.images.umount_rootfs(args)
 

-        # Umount data
-        helpers.mount.umount_all(args, tools.config.defaults["data"])
+        # Backwards compatibility
+        try:
+            helpers.mount.umount_all(args, tools.config.defaults["data"])
+        except:
+            pass

 
         if "session" in args:
             if quit_session:
 
         if "session" in args:
             if quit_session: