From 9d0d5ca05b16544e10f4c69983149218be04fc2b Mon Sep 17 00:00:00 2001 From: xiexiaobao Date: Tue, 30 Jun 2026 13:06:38 +0800 Subject: [PATCH] fix: move config restore into boot() after p4 mount --- .../files/etc/uci-defaults/99-restore-config | 16 ---------------- .../diy/expand-overlay/files/expand-overlay.init | 13 +++++++++++++ 2 files changed, 13 insertions(+), 16 deletions(-) delete mode 100755 package/diy/branding/files/etc/uci-defaults/99-restore-config diff --git a/package/diy/branding/files/etc/uci-defaults/99-restore-config b/package/diy/branding/files/etc/uci-defaults/99-restore-config deleted file mode 100755 index 80e049fa80..0000000000 --- a/package/diy/branding/files/etc/uci-defaults/99-restore-config +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh -# 升级后恢复 frpc 等配置 -BACKUP="/mnt/mmc2-4/upgrade-backup" - -if [ -f "$BACKUP/frpc" ]; then - cp "$BACKUP/frpc" /etc/config/frpc 2>/dev/null - /etc/init.d/frpc restart 2>/dev/null - logger -t "restore-config" "frpc restored from backup" -fi - -if [ -f "$BACKUP/network" ]; then - cp "$BACKUP/network" /etc/config/network 2>/dev/null - logger -t "restore-config" "network restored from backup" -fi - -exit 0 diff --git a/package/diy/expand-overlay/files/expand-overlay.init b/package/diy/expand-overlay/files/expand-overlay.init index c303b49a61..4c603996ef 100644 --- a/package/diy/expand-overlay/files/expand-overlay.init +++ b/package/diy/expand-overlay/files/expand-overlay.init @@ -47,5 +47,18 @@ boot() { touch "$p4flag" fi + # ---- Stage 2c: Restore frpc/network from backup (p4 now mounted) ---- + BACKUP="/mnt/data/upgrade-backup" + if [ -f "$BACKUP/frpc" ] && [ ! -f /etc/config/frpc.orig ]; then + cp /etc/config/frpc /etc/config/frpc.orig 2>/dev/null + cp "$BACKUP/frpc" /etc/config/frpc + /etc/init.d/frpc restart 2>/dev/null + logger -t "restore" "frpc restored from backup" + fi + if [ -f "$BACKUP/network" ]; then + cp "$BACKUP/network" /etc/config/network + logger -t "restore" "network restored from backup" + fi + return 0 }