Improved Code to Unmount USB Drive

Made improvements in function to unmount the USB drives before flashing F/W image.

Author: Martinski4GitHub

MerlinAU.sh

@@ -4,16 +4,16 @@
 #
 # Original Creation Date: 2023-Oct-01 by @ExtremeFiretop.
 # Official Co-Author: @Martinski W. - Date: 2023-Nov-01
-# Last Modified: 2025-Nov-09
+# Last Modified: 2025-Nov-10
 ###################################################################
 set -u
 
 ## Set version for each Production Release ##
 readonly SCRIPT_VERSION=1.5.7
-readonly SCRIPT_VERSTAG="25110922"
+readonly SCRIPT_VERSTAG="25111002"
 readonly SCRIPT_NAME="MerlinAU"
 ## Set to "master" for Production Releases ##
-SCRIPT_BRANCH="master"
+SCRIPT_BRANCH="dev"
 
 ##----------------------------------------##
 ## Modified by Martinski W. [2024-Jul-03] ##
@@ -8777,27 +8777,55 @@ _RunOfflineUpdateNow_()
 ##-------------------------------------##
 _Unmount_Eject_USB_Drives_()
 {
-    local eject_USB_OK=1  usbMountPoint=""
-    local curWaitDelaySecs=0
-    local theWaitDelaySecs=5
-    local maxWaitDelaySecs=180  # 3 mins enough time?? #
+    local maxWaitDelaySecs=240  #4 mins#
+    local theWaitDelaySecs=5  curWaitDelaySecs=0
+    local ejectUSB_OK=false  ejectUSB_PID=""  usbMountPoint=""
     local logMsg="Unmount/Eject USB Drive"
 
     _MsgToSysLog_() { logger -st "${SCRIPT_NAME}_[$$]" -p 4 "$1" ; }
 
     _MsgToSysLog_ "START of ${logMsg}..."
 
+    /sbin/ejusb -1 0 -u 1 2>/dev/null & ejectUSB_PID=$!
+
     while [ "$curWaitDelaySecs" -lt "$maxWaitDelaySecs" ]
     do
-        if /sbin/ejusb -1 0 -u 1 2>/dev/null
+        ## If unmount succeeded, then exit loop ##
+        if [ -n "$ejectUSB_PID" ] && \
+           ! kill -EXIT "$ejectUSB_PID" 2>/dev/null && \
+           ! usbMountPoint="$(_GetDefaultUSBMountPoint_)"
         then
-            eject_USB_OK=0 ; break
+            ejectUSB_OK=true ; break
         fi
+
+        ## If USB drive is no longer mounted, exit loop ##
         if ! usbMountPoint="$(_GetDefaultUSBMountPoint_)"
         then
-            _MsgToSysLog_ "${logMsg}. No USB-attached drives were found."
-            eject_USB_OK=0 ; break
+            _MsgToSysLog_ "${logMsg}: No USB drives are mounted."
+            ejectUSB_OK=true ; break
+        fi
+
+        ## If timeout was reached, check again and exit loop ##
+        if [ -n "$ejectUSB_PID" ] && \
+           [ "$curWaitDelaySecs" -ge "$maxWaitDelaySecs" ]
+        then
+            if ! kill -EXIT "$ejectUSB_PID" 2>/dev/null && \
+               ! usbMountPoint="$(_GetDefaultUSBMountPoint_)"
+            then
+                ejectUSB_OK=true ; break
+            fi
+            kill -KILL "$ejectUSB_PID" 2>/dev/null
+            wait $ejectUSB_PID ; break
+        fi
+
+        ## If USB drive is still mounted, try again ##
+        if [ -n "$ejectUSB_PID" ] && \
+           ! kill -EXIT "$ejectUSB_PID" 2>/dev/null && \
+           usbMountPoint="$(_GetDefaultUSBMountPoint_)"
+        then
+            /sbin/ejusb -1 0 -u 1 2>/dev/null & ejectUSB_PID=$!
         fi
+
         if [ "$curWaitDelaySecs" -gt 0 ] && \
            [ "$((curWaitDelaySecs % 10))" -eq 0 ]
         then _MsgToSysLog_ "$logMsg Wait Timeout [$curWaitDelaySecs secs]..."
@@ -8807,18 +8835,17 @@ _Unmount_Eject_USB_Drives_()
         curWaitDelaySecs="$((curWaitDelaySecs + theWaitDelaySecs))"
     done
 
-    if [ "$curWaitDelaySecs" -lt "$maxWaitDelaySecs" ]
-    then _MsgToSysLog_ "$logMsg [$curWaitDelaySecs secs] succeeded."
-    else _MsgToSysLog_ "$logMsg Wait Timeout [$maxWaitDelaySecs secs] expired."
-    fi
-
-    if [ "$eject_USB_OK" -ne 0 ]
+    if "$ejectUSB_OK" || \
+       [ "$curWaitDelaySecs" -lt "$maxWaitDelaySecs" ]
     then
+        _MsgToSysLog_ "$logMsg succeeded [$curWaitDelaySecs secs]"
+    else
+        _MsgToSysLog_ "$logMsg Wait Timeout [$maxWaitDelaySecs secs] expired."
         _MsgToSysLog_ "Unable to unmount USB drive. Device is likely busy."
     fi
-
     _MsgToSysLog_ "END of ${logMsg}."
-    return "$eject_USB_OK"
+
+    "$ejectUSB_OK" && return 0 || return 1
 }
 
 ##----------------------------------------##

README.md

@@ -1,7 +1,7 @@
 # MerlinAU - AsusWRT-Merlin Firmware Auto Updater
 
 ## v1.5.7
-## 2025-Nov-09
+## 2025-Nov-10
 
 ## WebUI:
 ![image](https://github.com/user-attachments/assets/9c1dff99-9c13-491b-a7fa-aff924d5f02e)