From 9e9b793aabba69596b73ab32ba032ccdc6f7ecb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20M=C3=BCller?= <philm@manjaro.org>
Date: Tue, 20 Jul 2021 09:07:52 +0000
Subject: [PATCH] Update util-iso-mount.sh

---
 lib/util-iso-mount.sh | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/lib/util-iso-mount.sh b/lib/util-iso-mount.sh
index de34737..551363d 100644
--- a/lib/util-iso-mount.sh
+++ b/lib/util-iso-mount.sh
@@ -59,24 +59,10 @@ mount_fs_net(){
     track_fs -t overlay overlay -olowerdir="${work_dir}/livefs":"${work_dir}/rootfs",upperdir="$1",workdir="${mnt_dir}/work" "$1"
 }
 
-check_mount() {
-    busy=true
-    while $busy
-    do
-        if mountpoint -q "$1"
-        then
-            umount -l "$1" 2> /dev/null
-            if [ $? -eq 0 ]
-            then
-                busy=false  # umount successful
-            else
-                echo -n '.'  # output to show that the script is alive
-                sleep 5      # 5 seconds for testing, modify to 300 seconds later on
-            fi
-        else
-            busy=false  # not mounted
-        fi
-    done
+check_umount() {
+    if [[ mountpoint -q "$1" ]]; then
+        umount -l "$1"
+    fi
 }
 
 umount_fs(){
@@ -87,7 +73,7 @@ umount_fs(){
         for i in "${FS_ACTIVE_MOUNTS[@]}"
         do
             cat /proc/mounts
-            check_mount $i
+            check_umount $i
             cat /proc/mounts
         done
         unset FS_ACTIVE_MOUNTS