lxc: Only add /dev/ashmem to config_nodes when it exists

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

diff --git a/tools/actions/container_manager.py b/tools/actions/container_manager.py
index e36cfbfcb503e16e5173d2bf1f30f74f0bb0210e..cbd62988b6a0d61d8cc8a2b120287228fe2449d8 100644 (file)
--- a/tools/actions/container_manager.py
+++ b/tools/actions/container_manager.py
@@ -123,10 +123,7 @@ 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 +
@@ -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
@@ -165,19 +162,10 @@ def do_start(args, session):
     set_permissions(args)
 
     helpers.lxc.start(args)
-    lxc_status = helpers.lxc.status(args)
-    timeout = 10
-    while lxc_status != "RUNNING" and timeout > 0:
-        lxc_status = helpers.lxc.status(args)
-        logging.info(
-            "waiting {} seconds for container to start...".format(timeout))
-        timeout = timeout - 1
-        time.sleep(1)
-    if lxc_status != "RUNNING":
-        raise OSError("container failed to start")
-
     services.hardware_manager.start(args)
 
+    args.session = session
+
 def stop(args):
     try:
         services.hardware_manager.stop(args)