From 7f1000190ca62cd9e6ddd6e4afa71198dfea481e Mon Sep 17 00:00:00 2001
From: kenzok8 <kenzok8@users.noreply.github.com>
Date: Fri, 20 Jun 2025 04:27:28 +0800
Subject: [PATCH] update 2025-06-20 04:27:28

---
 .../root/etc/hotplug.d/iface/19-fakemesh             |  2 +-
 luci-app-fakemesh/root/etc/init.d/fakemesh           |  2 +-
 luci-app-fakemesh/root/usr/sbin/fakemesh             |  6 +++++-
 luci-app-store/Makefile                              |  2 +-
 .../root/usr/libexec/istore/overlay-backup           | 12 +++++++++---
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/luci-app-fakemesh/root/etc/hotplug.d/iface/19-fakemesh b/luci-app-fakemesh/root/etc/hotplug.d/iface/19-fakemesh
index 4e9c74d05..d73f270bb 100644
--- a/luci-app-fakemesh/root/etc/hotplug.d/iface/19-fakemesh
+++ b/luci-app-fakemesh/root/etc/hotplug.d/iface/19-fakemesh
@@ -22,7 +22,7 @@ if [ "$enabled" = "1" ]; then
 		/etc/init.d/umdns running && /etc/init.d/umdns restart
 	}
 fi
-band_steer_helper=$(uci get fakemesh.default.band_steer_helper || echo usteer)
+band_steer_helper=$(uci get fakemesh.default.band_steer_helper || echo none)
 band_steer_helper="$band_steer_helper" /usr/sbin/fakemesh band_steer_helper_switch
 
 /etc/init.d/umdns enabled && {
diff --git a/luci-app-fakemesh/root/etc/init.d/fakemesh b/luci-app-fakemesh/root/etc/init.d/fakemesh
index 5126d58c5..15fedbdfe 100755
--- a/luci-app-fakemesh/root/etc/init.d/fakemesh
+++ b/luci-app-fakemesh/root/etc/init.d/fakemesh
@@ -10,7 +10,7 @@ start() {
 	touch /tmp/fakemesh.ac.config
 	ln -s /tmp/fakemesh.ac.config /etc/config/fakemeshac 2>/dev/null
 
-	band_steer_helper=$(uci get fakemesh.default.band_steer_helper || echo usteer) exec /usr/sbin/fakemesh band_steer_helper_switch &
+	band_steer_helper=$(uci get fakemesh.default.band_steer_helper || echo none) exec /usr/sbin/fakemesh band_steer_helper_switch &
 	/usr/sbin/fakemesh
 }
 
diff --git a/luci-app-fakemesh/root/usr/sbin/fakemesh b/luci-app-fakemesh/root/usr/sbin/fakemesh
index c9977a44e..bc7c8c36a 100644
--- a/luci-app-fakemesh/root/usr/sbin/fakemesh
+++ b/luci-app-fakemesh/root/usr/sbin/fakemesh
@@ -3,7 +3,7 @@
 . /lib/functions.sh
 . /lib/functions/network.sh
 
-band_steer_helper=${band_steer_helper:-usteer}
+band_steer_helper=${band_steer_helper:-none}
 
 band_steer_helper_switch()
 {
@@ -45,6 +45,10 @@ band_steer_helper_switch()
 	exit 0
 }
 
+[ "x$1" = "xsetup" ] && {
+	exit 0
+}
+
 config_load fakemesh
 
 config_get_bool enabled default 'enabled' '0'
diff --git a/luci-app-store/Makefile b/luci-app-store/Makefile
index c84b248c9..f7824646a 100644
--- a/luci-app-store/Makefile
+++ b/luci-app-store/Makefile
@@ -11,7 +11,7 @@ LUCI_DEPENDS:=+curl +opkg +luci-base +tar +libuci-lua +mount-utils +luci-lib-tas
 LUCI_EXTRA_DEPENDS:=luci-lib-taskd (>=1.0.19)
 LUCI_PKGARCH:=all
 
-PKG_VERSION:=0.1.29-4
+PKG_VERSION:=0.1.29-5
 # PKG_RELEASE MUST be empty for luci.mk
 PKG_RELEASE:=
 
diff --git a/luci-app-store/root/usr/libexec/istore/overlay-backup b/luci-app-store/root/usr/libexec/istore/overlay-backup
index b260231dc..8a6970a08 100755
--- a/luci-app-store/root/usr/libexec/istore/overlay-backup
+++ b/luci-app-store/root/usr/libexec/istore/overlay-backup
@@ -143,11 +143,16 @@ restore() {
         if echo "${BACKUP_PATH_FILE}" | grep -q '\.s\.overlay\.tar\.gz$' ; then
             local uuid label device line
             local uci_section=$(uci -c /overlay/upper/etc/config show fstab | grep '^fstab\.@mount\[[0-9]*\]\.target='"'/overlay'\$" | head -1 | grep -o '^fstab\.@mount\[[0-9]*\]')
+            if [ -z "$uci_section" ]; then
+                echo "failed to find sandbox config, there is debug info:"
+                uci -c /overlay/upper/etc/config show fstab | grep '^fstab\.[^.]*\.target='"'/overlay'\$"
+                exit 1
+            fi
             while read line; do
                 export -n "$line"
-            done < <(
-                uci -c /overlay/upper/etc/config show "$uci_section" | sed -e '/^fstab\.[^\.]*=/d' -e 's/^fstab\.[^\.]*\.//g' | grep -e '^uuid=' -e '^label=' -e '^device=' | sed "s/'//g"
-            )
+            done <<EOF
+                $(uci -c /overlay/upper/etc/config show "$uci_section" | sed -e '/^fstab\.[^\.]*=/d' -e 's/^fstab\.[^\.]*\.//g' | grep -e '^uuid=' -e '^label=' -e '^device=' | sed "s/'//g")
+EOF
             SANDBOX_UUID=$uuid
             SANDBOX_LABEL=$label
             SANDBOX_DEVICE=$device
@@ -191,6 +196,7 @@ filter_backups() {
 get_backup_file_list() {
     if [ -n "$1" ]; then
         ( cd "$1" && ls backup_overlay_*.overlay.tar.gz | filter_backups )
+        return 0
     else
         echo "input backup path is null"
         exit 1