From: Alessandro Astone <ales.astone@gmail.com>
Date: Sun, 22 Jan 2023 18:26:08 +0000 (+0100)
Subject: container_manager: Mount rootfs last
X-Git-Tag: 1.4.0~22
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/4154902c599e7faf8fa35d1f9f31c1fa3b0b354e

container_manager: Mount rootfs last

If something else fails we won't have to unmount it
---

diff --git a/tools/actions/container_manager.py b/tools/actions/container_manager.py
index 5a6fe71..bb3b650 100644
--- a/tools/actions/container_manager.py
+++ b/tools/actions/container_manager.py
@@ -142,12 +142,6 @@ def do_start(args, session):
         tools.helpers.run.user(
             args, ["waydroid-sensord", "/dev/" + args.HWBINDER_DRIVER], output="background")
 
-    # Mount rootfs
-    cfg = tools.config.load(args)
-    helpers.images.mount_rootfs(args, cfg["waydroid"]["images_path"], session)
-
-    helpers.protocol.set_aidl_version(args)
-
     # Cgroup hacks
     if which("start"):
         command = ["start", "cgroup-lite"]
@@ -172,6 +166,12 @@ def do_start(args, session):
             helpers.mount.bind(args, session["waydroid_data"],
                                tools.config.defaults["data"])
 
+    # Mount rootfs
+    cfg = tools.config.load(args)
+    helpers.images.mount_rootfs(args, cfg["waydroid"]["images_path"], session)
+
+    helpers.protocol.set_aidl_version(args)
+
     helpers.lxc.start(args)
     services.hardware_manager.start(args)