fix(openwrt): 自动恢复系统 DNS 并发布 Beta r2 / restore DNS and ship Beta r2 - #91
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
MSM 接管 OpenWrt 的 DNS 53 后，停止、卸载和升级会等待系统 dnsmasq 恢复；钩子会报告恢复错误并保留应用恢复状态；APK 不能保证钩子失败时中止包操作，安装指南要求先独立停止成功再执行升级或卸载。核心运行逻辑已推送 msm/dev（5de1fa1c），保留 DHCP，其他 TCP/UDP 端口冲突在启动前报告占用进程。
Beta 核心包修订升至 r2，LuCI 保持 r3。LuCI 独立发布校验支持统一的核心修订号，仍严格核对 18 个架构/格式包。
验证：OpenWrt 打包与生命周期回归通过；Linux 真实 APK 安装/升级/卸载测试通过；LuCI 发布专项 18/18 通过。ARM64 真机已验证 DNS 接管、重启、停止恢复、端口 80 冲突、启动失败回滚，以及 procd 停止钩子。前后网络、防火墙及 DHCP 配置保持一致。
Restore dnsmasq before stopping, removing or upgrading the OpenWrt package, preserve recovery state on failure, and publish core revision 2 through the Beta workflow. Stable release workflow and stable 1.2.6 are unchanged.