update

.github/workflows/Openwrt-AutoBuild.yml

@@ -195,9 +195,9 @@ jobs:
         echo ${{ env.date4 }} > version.txt
         rename -v "s/^openwrt/${{ env.date3 }}-openwrt/" *
         rename -v "s/friendlyarm_//" *gz
-        if [ "$(find ./ -name *vmdk)" ]; then
+        if [ "$(ls *vmdk)" ]; then
             mkdir EXSI专用
-            mv *vmdk* EXSI专用/
+            mv -f *vmdk* EXSI专用/
         fi
         md5=$((md5sum *squashfs-sysupgrade* || md5sum *squashfs-combined-efi*) | awk '{print $1}') 2>/dev/null
         echo $md5 >> version.txt

devices/common/diy.sh

@@ -6,6 +6,7 @@ sed -i '/	refresh_config();/d' scripts/feeds
 ./scripts/feeds install -a -p custom
 ./scripts/feeds install -a
 cd feeds/custom; git pull; cd -
+sed -i 's/\/cgi-bin\/\(luci\|cgi-\)/\/\1/g' `find package/feeds/custom/luci-*/ -name "*.lua" -or -name "*.htm*" -or -name "*.js"` &
 sed -i 's/Os/O2/g' include/target.mk
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/upx tools/upx
 svn export --force https://github.com/coolsnowwolf/lede/trunk/tools/ucl tools/ucl

devices/common/files/etc/config/nginx

@@ -6,8 +6,6 @@ config server '_lan'
 	list listen '80 default_server'
 	list listen '[::]:80 default_server'
 	option server_name 'op'
-	option index 'nginx.html index.html'
-	list include 'restrict_locally'
 	list include 'conf.d/*.locations'
 	option access_log 'off; # logd openwrt'
 	
@@ -15,8 +13,6 @@ config server '_ssl'
 	list listen '443 ssl'
 	list listen '[::]:443 ssl'
 	option server_name '_ssl'
-	option index 'nginx.html index.html'
-	list include 'restrict_locally'
 	list include 'conf.d/*.locations'
 	option uci_manage_ssl 'self-signed'
 	option ssl_certificate '/etc/nginx/conf.d/_lan.crt'

devices/common/patches/opkginstall.patch

@@ -249,3 +249,17 @@
  		mkdir -p "$ETCBACKUP_DIR"
  		# Avoid touching filesystem on each backup
  		RAMFS="$(mktemp -d -t sysupgrade.XXXXXX)"
+
+--- a/package/base-files/files/lib/functions.sh
++++ b/package/base-files/files/lib/functions.sh
+@@ -283,7 +283,9 @@ default_postinst() {
+ 			if [ "$PKG_UPGRADE" != "1" ]; then
+ 				"$i" enable
+ 			fi
+-			"$i" start
++			if "$i" enabled; then
++				"$i" start
++			fi
+ 		fi
+ 	done
+