Skip to content

[v1.x] Bound Asuswrt-Merlin PreRun waits - #10

Closed
maghuro wants to merge 2 commits into
v1.0from
fix/v1-merlin-prerun-timeouts
Closed

maghuro wants to merge 2 commits into
v1.0from
fix/v1-merlin-prerun-timeouts

Conversation

@maghuro

@maghuro maghuro commented Sep 27, 2026

Copy link
Copy Markdown
Owner

Important

Local staging/review draft in the fork only. Upstream contribution guidelines require an issue before any PR.

Targeted at the maintained v1.x router-support line. This is the v1.x port of draft #9.

Summary

Prevent the Asuswrt-Merlin startup path from waiting forever when required paths or dnsmasq never become available.

  • replace the unbounded directory wait loop with a timeout-aware helper;
  • bound waits for /tmp and /proc to 60 seconds;
  • bound the dnsmasq pidof wait to 60 seconds;
  • treat normal pidof "not found yet" exit status as retryable while propagating real execution errors;
  • return contextual startup errors instead of wedging ctrld indefinitely;
  • add tests for success, probe failure and timeout behavior.

Scope

Independent from the Merlin dnsmasq/SDN work (#6/#7) and service lifecycle work (#8).

@maghuro maghuro closed this Sep 27, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant