Skip to content

Update MerlinAU.sh#52

Merged
ExtremeFiretop merged 1 commit intoExtremeFiretop:devfrom
Martinski4GitHub:dev
Dec 24, 2023
Merged

Update MerlinAU.sh#52
ExtremeFiretop merged 1 commit intoExtremeFiretop:devfrom
Martinski4GitHub:dev

Conversation

@Martinski4GitHub
Copy link
Collaborator

Added/modified code to output some trace log messages when the "DoCleanUp" & "Reset_LEDs" functions are called after the F/W Update process is completed. This should leave a trace indicating IF/WHEN the "cleanup" is done as expected, especially if the router reboots itself.

Creating the trace log is only temporary (/jffs/addons/MerlinAU/ MerlinAU_Trace.LOG). We can switch it off later on once we have determined whether the "trap" mechanism is working as expected.

Added/modified code to output some trace log messages when the "_DoCleanUp_" & "_Reset_LEDs_" functions are called after the F/W Update process is completed. This should leave a trace indicating IF/WHEN the "cleanup" is done as expected, especially if the router reboots itself.

This trace log is only temporary. We can switch it off later on once we have determined whether the "trap" mechanism is working after the F/W Update.
@ExtremeFiretop
Copy link
Owner

Haha I was just testing this.

In my modification I did:

trap "Say 'Trap Triggered' ; exit 0" HUP INT QUIT TERM

And then commented out the reboot lines at the end of the curl.

This was the result:

syslog__TRAP_TRIGGERED_BY_Upgrade.txt
GT-AXE11000_FW_Update_2023-12-24_TRAP_TRIGGERED_BY_CTRLC.log

@ExtremeFiretop ExtremeFiretop added documentation Improvements or additions to documentation help wanted Extra attention is needed question Further information is requested labels Dec 24, 2023
@ExtremeFiretop
Copy link
Owner

ExtremeFiretop commented Dec 24, 2023

One thing I noticed is the trap doesn't seem to properly/gracefully exit the script when done by control+c? Was this addressed in your PR?

image

@ExtremeFiretop
Copy link
Owner

Just confirmed the trap does correctly close with your PR.

Maybe it was with my testing method, either way I like the extra logging so I'll merge.

@ExtremeFiretop ExtremeFiretop merged commit e922322 into ExtremeFiretop:dev Dec 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

documentation Improvements or additions to documentation help wanted Extra attention is needed question Further information is requested

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants