From 4e4f79cf99fcded45f109ca7cc2bd2821ca97612 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 23 Nov 2021 20:30:25 +0800 Subject: [PATCH] update-11.23 --- aliyundrive-webdav/Makefile | 2 +- luci-app-aliyundrive-webdav/Makefile | 2 +- .../root/etc/uci-defaults/96-wizard-defaults | 12 ++++++++++++ 3 files changed, 14 insertions(+), 2 deletions(-) create mode 100644 luci-app-wizard/root/etc/uci-defaults/96-wizard-defaults diff --git a/aliyundrive-webdav/Makefile b/aliyundrive-webdav/Makefile index 922ca5ff8..4302b26eb 100644 --- a/aliyundrive-webdav/Makefile +++ b/aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aliyundrive-webdav -PKG_VERSION:=0.5.5 +PKG_VERSION:=1.0.0 PKG_RELEASE:=$(AUTORELESE) PKG_LICENSE:=MIT diff --git a/luci-app-aliyundrive-webdav/Makefile b/luci-app-aliyundrive-webdav/Makefile index 1c32b8b10..656dc0017 100644 --- a/luci-app-aliyundrive-webdav/Makefile +++ b/luci-app-aliyundrive-webdav/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-aliyundrive-webdav -PKG_VERSION:=0.5.5 +PKG_VERSION:=1.0.0 PKG_RELEASE:=1 PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE) diff --git a/luci-app-wizard/root/etc/uci-defaults/96-wizard-defaults b/luci-app-wizard/root/etc/uci-defaults/96-wizard-defaults new file mode 100644 index 000000000..654c47e5f --- /dev/null +++ b/luci-app-wizard/root/etc/uci-defaults/96-wizard-defaults @@ -0,0 +1,12 @@ +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 + +uci commit wizard + +exit 0