From: Alessandro Astone <ales.astone@gmail.com>
Date: Sun, 29 Jan 2023 21:38:23 +0000 (+0100)
Subject: lxc: Handle lxc-info failure
X-Git-Tag: 1.4.0~9
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/f33173d8e339ba70853bf54ea14fb597abf9566b

lxc: Handle lxc-info failure

So that init/upgrade can go on and regenerate the lxc configs if
that's what's broken
---

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index 3f7ad74..5007e2b 100644
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -372,8 +372,11 @@ def setup_host_perms(args):
 
 def status(args):
     command = ["lxc-info", "-P", tools.config.defaults["lxc"], "-n", "waydroid", "-sH"]
-    out = subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf-8').strip()
-    return out
+    try:
+        return tools.helpers.run.user(args, command, output_return=True).strip()
+    except:
+        logging.info("Couldn't get LXC status. Assuming STOPPED.")
+        return "STOPPED"
 
 def wait_for_running(args):
     lxc_status = status(args)