]> glassweightruler.freedombox.rocks Git - waydroid.git/commitdiff
container: Only umount /sys/fs/cgroup/schedtune if needed
authorJami Kettunen <jami.kettunen@protonmail.com>
Sun, 10 Jul 2022 12:39:08 +0000 (15:39 +0300)
committerAlessandro Astone <ales.astone@gmail.com>
Thu, 14 Jul 2022 17:36:45 +0000 (19:36 +0200)
Silences the following useless log from "waydroid log" outputs when the
directory either doesn't exist at all (mainline Linux devices), or when
it's not mounted on Halium:

  (027693) [15:21:39] % umount -l /sys/fs/cgroup/schedtune
  umount: /sys/fs/cgroup/schedtune: not mounted

Reference: https://docs.python.org/3/library/os.path.html#os.path.ismount

tools/actions/container_manager.py

index d6ce155f86935b8fc23849e26ab20d1e62bad94b..f242b862bbd63de07ef1a6d8074cecdca2ecc2d0 100644 (file)
@@ -169,8 +169,9 @@ def start(args):
         if which("start"):
             command = ["start", "cgroup-lite"]
             tools.helpers.run.user(args, command, check=False)
         if which("start"):
             command = ["start", "cgroup-lite"]
             tools.helpers.run.user(args, command, check=False)
-        command = ["umount", "-l", "/sys/fs/cgroup/schedtune"]
-        tools.helpers.run.user(args, command, check=False)
+        if os.path.ismount("/sys/fs/cgroup/schedtune"):
+            command = ["umount", "-l", "/sys/fs/cgroup/schedtune"]
+            tools.helpers.run.user(args, command, check=False)
 
         #TODO: remove NFC hacks
         if which("stop"):
 
         #TODO: remove NFC hacks
         if which("stop"):