maple/istoreos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: move config restore into boot() after p4 mount

Browse Source
This commit is contained in:
xiexiaobao 2026-06-30 13:06:38 +08:00
parent 32e8f5abfc
commit 9d0d5ca05b
2 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
package/diy/branding/files/etc/uci-defaults/99-restore-config
View File

@ -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

13
package/diy/expand-overlay/files/expand-overlay.init
View File

@ -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
}