Merge ba51ccaee4 into 1a2d3ad643

tools/container.py

@@ -22,7 +22,7 @@ def use_overlayfs():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
     if not os.path.isfile(cfg_file):
-        Logger.error("Cannot locate waydroid config file, reinit wayland and try again!")
+        Logger.error("Cannot locate waydroid config file, reinit waydroid and try again!")
         sys.exit(1)
     cfg.read(cfg_file)
     if "waydroid" not in cfg:
@@ -50,4 +50,4 @@ def is_running():
         return "Session:\tRUNNING" in run(["waydroid", "status"]).stdout.decode()
 
 def upgrade():
-    run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")
+    run(["waydroid", "upgrade", "-o"], ignore=r"\[.*\] Stopping container\n\[.*\] Starting container")

tools/images.py

@@ -32,7 +32,7 @@ def get_image_dir():
     cfg = configparser.ConfigParser()
     cfg_file = os.environ.get("WAYDROID_CONFIG", "/var/lib/waydroid/waydroid.cfg")
     if not os.path.isfile(cfg_file):
-        Logger.error("Cannot locate waydroid config file, reinit wayland and try again!")
+        Logger.error("Cannot locate waydroid config file, reinit waydroid and try again!")
         sys.exit(1)
     cfg.read(cfg_file)
     if "waydroid" not in cfg: