X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/fb92d3a016a956e8520e938b59f55bd0fe9c2deb..b910c891740026aeba2cd6a86f93ca87ef57e3c6:/tools/actions/container_manager.py diff --git a/tools/actions/container_manager.py b/tools/actions/container_manager.py index 29ba552..ddfc3bb 100644 --- a/tools/actions/container_manager.py +++ b/tools/actions/container_manager.py @@ -123,15 +123,12 @@ def start(args): def do_start(args, session): if "session" in args: - logging.info("Already tracking a session") - return - - args.session = session + raise RuntimeError("Already tracking a session") # Networking command = [tools.config.tools_src + "/data/scripts/waydroid-net.sh", "start"] - tools.helpers.run.user(args, command, check=False) + tools.helpers.run.user(args, command) # Sensors if which("waydroid-sensord"): @@ -140,12 +137,12 @@ def do_start(args, session): # Mount rootfs cfg = tools.config.load(args) - helpers.images.mount_rootfs(args, cfg["waydroid"]["images_path"], args.session) + helpers.images.mount_rootfs(args, cfg["waydroid"]["images_path"], session) helpers.protocol.set_aidl_version(args) # Mount data - helpers.mount.bind(args, args.session["waydroid_data"], + helpers.mount.bind(args, session["waydroid_data"], tools.config.defaults["data"]) # Cgroup hacks @@ -167,6 +164,8 @@ def do_start(args, session): helpers.lxc.start(args) services.hardware_manager.start(args) + args.session = session + def stop(args): try: services.hardware_manager.stop(args)