From f2bbea2e0a52d369fb240c4c897bb8ffbab74afa Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Fri, 18 Sep 2026 06:10:50 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=85=20Sync=202026-09-18=2006:10:50?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../htdocs/luci-static/resources/view/wizard/initsetup.js | 7 ------- luci-app-wizard/root/etc/init.d/wizard | 7 ++----- wwand/Makefile | 6 +++--- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js index 1e4bb7236..d91ad59f6 100644 --- a/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js +++ b/luci-app-wizard/htdocs/luci-static/resources/view/wizard/initsetup.js @@ -56,13 +56,6 @@ return view.extend({ o = s.taboption('netsetup', form.Value, 'lan_ipaddr', _('IPv4 address')); o.datatype = 'ip4addr'; - o = s.taboption('netsetup', form.Value, 'lan_netmask', _('IPv4 netmask')); - o.datatype = 'ip4addr'; - o.value('255.255.255.0'); - o.value('255.255.0.0'); - o.value('255.0.0.0'); - o.default = '255.255.255.0'; - o = s.taboption('netsetup', form.DynamicList, 'lan_dns', _('Use custom DNS servers'), _('Leave empty to use ISP DNS')); o.datatype = 'ip4addr'; o.cast = 'string'; diff --git a/luci-app-wizard/root/etc/init.d/wizard b/luci-app-wizard/root/etc/init.d/wizard index d559f2419..ade0a75e2 100755 --- a/luci-app-wizard/root/etc/init.d/wizard +++ b/luci-app-wizard/root/etc/init.d/wizard @@ -11,7 +11,7 @@ boot() { add_wizard() { local cfg="$1" local wan_proto wan_pppoe_user wan_pppoe_pass - local lan_ipaddr lan_netmask lan_dns lan_gateway dhcp + local lan_ipaddr lan_dns lan_gateway dhcp local device ipv6 old_ipv6 wifi_ssid wifi_key old_wifi_ssid old_wifi_key config_get wan_proto "$cfg" wan_proto @@ -43,10 +43,8 @@ add_wizard() { esac config_get lan_ipaddr "$cfg" lan_ipaddr - config_get lan_netmask "$cfg" lan_netmask - test -n "${lan_ipaddr}" && test -n "${lan_netmask}" && { + test -n "${lan_ipaddr}" && { uci set network.lan.ipaddr="${lan_ipaddr}" - uci set network.lan.netmask="${lan_netmask}" } config_get siderouter "$cfg" siderouter @@ -162,7 +160,6 @@ uci -q set wizard.default.wan_proto="$(uci -q get network.wan.proto)" uci -q set wizard.default.wan_pppoe_user="$(uci -q get network.wan.username)" uci -q set wizard.default.wan_pppoe_pass="$(uci -q get network.wan.password)" uci -q set wizard.default.lan_ipaddr="$(uci -q get network.lan.ipaddr)" -uci -q set wizard.default.lan_netmask="$(uci -q get network.lan.netmask)" uci -q set wizard.default.lan_gateway="$(uci -q get network.lan.gateway)" uci -q set wizard.default.lan_dns="$(uci -q get network.lan.dns)" [ "$(uci -q get dhcp.lan.ignore)" ] && uci -q set wizard.default.dhcp="0" || uci -q del wizard.default.dhcp diff --git a/wwand/Makefile b/wwand/Makefile index 7e972acf2..1ae22d005 100644 --- a/wwand/Makefile +++ b/wwand/Makefile @@ -49,12 +49,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=wwand -PKG_VERSION:=1.6.7_p10 -PKG_RELEASE:=42 +PKG_VERSION:=1.6.7_p12 +PKG_RELEASE:=43 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/ddimension/wwand.git -PKG_SOURCE_VERSION:=6d135f52ec5a686b162bd6455917ce25c8080ae0 +PKG_SOURCE_VERSION:=a01cea056974c811ea4ac278838b7ca9231d1bf3 PKG_MIRROR_HASH:=skip PKG_LICENSE:=GPL-2.0-only