X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/79fada5c36517e2a12fc871567d54528f86a947a..refs/heads/electrikjesus-patch-1:/tools/actions/upgrader.py

diff --git a/tools/actions/upgrader.py b/tools/actions/upgrader.py
index 2400023..f35aac4 100644
--- a/tools/actions/upgrader.py
+++ b/tools/actions/upgrader.py
@@ -3,8 +3,9 @@
 import logging
 import os
 from tools import helpers
+from tools.helpers.version import versiontuple
 import tools.config
-
+import dbus
 
 def get_config(args):
     cfg = tools.config.load(args)
@@ -13,6 +14,18 @@ def get_config(args):
     args.vendor_type = cfg["waydroid"]["vendor_type"]
     args.system_ota = cfg["waydroid"]["system_ota"]
     args.vendor_ota = cfg["waydroid"]["vendor_ota"]
+    args.session = None
+
+def migration(args):
+    try:
+        old_ver = tools.helpers.props.file_get(args, args.work + "/waydroid_base.prop", "waydroid.tools_version")
+        if versiontuple(old_ver) <= versiontuple("1.3.4"):
+            chmod_paths = ["cache_http", "host-permissions", "lxc", "images", "rootfs", "data", "waydroid_base.prop", "waydroid.prop", "waydroid.cfg"]
+            tools.helpers.run.user(args, ["chmod", "-R", "g-w,o-w"] + [os.path.join(args.work, f) for f in chmod_paths], check=False)
+            tools.helpers.run.user(args, ["chmod", "g-w,o-w", args.work], check=False)
+            os.remove(os.path.join(args.work, "session.cfg"))
+    except:
+        pass
 
 def upgrade(args):
     get_config(args)
@@ -21,19 +34,28 @@ def upgrade(args):
         status = helpers.lxc.status(args)
     if status != "STOPPED":
         logging.info("Stopping container")
-        helpers.lxc.stop(args)
-    helpers.images.umount_rootfs(args)
+        try:
+            container = tools.helpers.ipc.DBusContainerService()
+            args.session = container.GetSession()
+            container.Stop(False)
+        except Exception as e:
+            logging.debug(e)
+            tools.actions.container_manager.stop(args)
+    migration(args)
     helpers.drivers.loadBinderNodes(args)
     if not args.offline:
-        preinstalled_images_path = tools.config.defaults["preinstalled_images_path"]
-        if args.images_path != preinstalled_images_path:
+        if args.images_path not in tools.config.defaults["preinstalled_images_paths"]:
             helpers.images.get(args)
         else:
-            logging.info("Upgrade refused because a pre-installed image is detected at {}.".format(preinstalled_images_path))
+            logging.info("Upgrade refused because a pre-installed image is detected at {}.".format(args.images_path))
+    helpers.drivers.probeAshmemDriver(args)
     helpers.lxc.setup_host_perms(args)
     helpers.lxc.set_lxc_config(args)
     helpers.lxc.make_base_props(args)
     if status != "STOPPED":
         logging.info("Starting container")
-        helpers.images.mount_rootfs(args, args.images_path)
-        helpers.lxc.start(args)
+        try:
+            container.Start(args.session)
+        except Exception as e:
+            logging.debug(e)
+            logging.error("Failed to restart container. Please do so manually.")