Unmount previously mounted filesystems for overlayfs

Unmount previously mounted filesystems for overlayfs so as not to pin loads of
memory if the scripts are repeatedly run when they keep failing with an error.

1 files changed, 21 insertions, 1 deletions

diff --git a/set_up.py b/set_up.py
index fdc6052..a34d004 100644
--- a/set_up.py
+++ b/set_up.py
@@ -22,7 +22,27 @@ def set_up(ctx):
     # union.
     if cfg.testing_unionmount():
         try:
-            while system("umount " + cfg.union_mntroot()):
+            while system("umount " + cfg.union_mntroot() + " >&/dev/null"):
+                pass
+        except RuntimeError:
+            pass
+
+    if cfg.testing_overlayfs():
+        try:
+            while system("grep 'lower_layer " + lower_mntroot + "' /proc/mounts >/dev/null" +
+                         " && umount " + lower_mntroot):
+                pass
+        except RuntimeError:
+            pass
+        try:
+            while system("grep 'upper_layer " + cfg.upper_mntroot() + "' /proc/mounts >/dev/null" +
+                         " && umount " + cfg.upper_mntroot()):
+                pass
+        except RuntimeError:
+            pass
+        try:
+            while system("grep 'overlayfs " + cfg.union_mntroot() + "' /proc/mounts >/dev/null" +
+                         " && umount " + cfg.union_mntroot()):
                 pass
         except RuntimeError:
             pass