update 2025-06-20 04:27:28

This commit is contained in:
kenzok8
2025-06-20 04:27:28 +08:00
parent d577c433e9
commit 7f1000190c
5 changed files with 17 additions and 7 deletions

View File

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

View File

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

View File

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

View File

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

View File

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