|
10 | 10 |
|
11 | 11 | ## Set version for each Production Release ## |
12 | 12 | readonly SCRIPT_VERSION=1.5.7 |
13 | | -readonly SCRIPT_VERSTAG="25111002" |
| 13 | +readonly SCRIPT_VERSTAG="25111020" |
14 | 14 | readonly SCRIPT_NAME="MerlinAU" |
15 | 15 | ## Set to "master" for Production Releases ## |
16 | 16 | SCRIPT_BRANCH="dev" |
@@ -3000,9 +3000,9 @@ _GetLatestFWUpdateVersionFromRouter_() |
3000 | 3000 | echo "$newVersionStr" ; return "$retCode" |
3001 | 3001 | } |
3002 | 3002 |
|
3003 | | -##------------------------------------------## |
3004 | | -## Modified by ExtremeFiretop [2025-Jun-17] ## |
3005 | | -##------------------------------------------## |
| 3003 | +##----------------------------------------## |
| 3004 | +## Modified by Martinski W. [2025-Nov-10] ## |
| 3005 | +##----------------------------------------## |
3006 | 3006 | _CreateEMailContent_() |
3007 | 3007 | { |
3008 | 3008 | if [ $# -eq 0 ] || [ -z "$1" ] ; then return 1 ; fi |
@@ -3080,6 +3080,13 @@ _CreateEMailContent_() |
3080 | 3080 | printf "\nThe F/W version that is currently installed:\n<b>${fwInstalledVersion}</b>\n" |
3081 | 3081 | } > "$tempEMailBodyMsg" |
3082 | 3082 | ;; |
| 3083 | + FAILED_USB_DRIVE_UNMOUNT) |
| 3084 | + emailBodyTitle="USB Drive Unmount Failed" |
| 3085 | + { |
| 3086 | + echo "Unable to unmount the USB-attached drive before the F/W Update flash was started on the <b>${MODEL_ID}</b> router." |
| 3087 | + printf "\nThe USB drive was likely in a busy state.\n" |
| 3088 | + } > "$tempEMailBodyMsg" |
| 3089 | + ;; |
3083 | 3090 | SUCCESS_SCRIPT_UPDATE_STATUS) |
3084 | 3091 | if [ -s "$SCRIPT_VERPATH" ] |
3085 | 3092 | then |
@@ -8842,6 +8849,7 @@ _Unmount_Eject_USB_Drives_() |
8842 | 8849 | else |
8843 | 8850 | _MsgToSysLog_ "$logMsg Wait Timeout [$maxWaitDelaySecs secs] expired." |
8844 | 8851 | _MsgToSysLog_ "Unable to unmount USB drive. Device is likely busy." |
| 8852 | + _SendEMailNotification_ FAILED_USB_DRIVE_UNMOUNT |
8845 | 8853 | fi |
8846 | 8854 | _MsgToSysLog_ "END of ${logMsg}." |
8847 | 8855 |
|
|
0 commit comments