update-12.04

luci-app-bypass/root/etc/init.d/bypass

@@ -976,6 +976,11 @@ gen_serv_include(){
 
 start_server(){
 	[ $(uci_get_by_type server_global enable_server 0) = 0 ] && return
+	if [[ "$(uci -q get smartdns.@smartdns[0].enabled)" == "1" ]]; then
+		uci -q del smartdns.@smartdns[0].enabled
+		uci commit smartdns
+		/etc/init.d/smartdns stop 2>/dev/null
+	fi
 	mkdir -p $VAR
 	config_load $NAME
 	config_foreach run_server server_config
@@ -990,11 +995,6 @@ start_monitor(){
 }
 
 start(){
-	if [[ "$(uci -q get smartdns.@smartdns[0].enabled)" == "1" ]]; then
-		uci -q del smartdns.@smartdns[0].enabled
-		uci commit smartdns
-		/etc/init.d/smartdns stop 2>/dev/null
-	fi
 	touch $LOC
 	if [ -n "$switch_server" ];then
 		GLOBAL_SERVER=$switch_server

luci-app-ddnsto/po/zh_Hans

@@ -0,0 +1 @@
+zh-cn

luci-app-linkease/po/zh_Hans

@@ -0,0 +1 @@
+zh-cn

luci-app-passwall/luasrc/view/passwall/global/status2.htm

@@ -142,12 +142,6 @@ local status = api.uci_get_type("global_other", "status", "")
 			</div>
 		</div>
 		<% end %>
-                <div class="cbi-value">
-    			<label class="cbi-value-title"></label>
-			<div class="cbi-value-field">
-    				<iframe src="https://ip.skk.moe/simple" style="width: 100%; border: 0"></iframe></div>
-			</div>
-	  	</div>
 	</fieldset>
 </fieldset>
 

nas-packages-luci/README.md

@@ -1,34 +0,0 @@
-# nas-packages-luci
-luci for [nas-packages](https://github.com/linkease/nas-packages)
-
-## 使用方法
-
-### 增加feed源
-
-```shell
-echo >> feeds.conf.default
-echo 'src-git nas https://github.com/linkease/nas-packages.git;master' >> feeds.conf.default
-echo 'src-git nas_luci https://github.com/linkease/nas-packages-luci.git;main' >> feeds.conf.default
-./scripts/feeds update nas nas_luci
-./scripts/feeds install -a -p nas
-./scripts/feeds install -a -p nas_luci
-```
-
-### 集成软件包
-
-```shell
-make menuconfig
-```
-
-选择软件包
-```plain
-LuCI --->
-3. Applications --->
-<*> luci-app-ddnsto.................................. LuCI support for ddnsto
-<*> luci-app-linkease.................................. LuCI support for linkease
-```
-
-### 构建固件
-```shell
-make
-```