kiddin9 4 éve
szülő
commit
6ae59bcad8

+ 0 - 4
devices/common/default-settings

@@ -16,10 +16,6 @@ fi
 
 sed -i '/profile.d/d' /lib/upgrade/keep.d/base-files
 
-test ! -f /etc/nginx/uci.conf && {
-	ln -sf /var/lib/nginx/uci.conf /etc/nginx/uci.conf
-}
-
 sed -i 's/\(custom.*\)\/custom/\1/' /etc/opkg/distfeeds.conf
 sed -i 's?\(src/gz openwrt_core\)?#\1?' /etc/opkg/distfeeds.conf
 

+ 14 - 0
devices/common/patches/nginx_luci.patch

@@ -41,3 +41,17 @@
  	if [ "$mode" -gt 0 ] ; then
  		ifdashname="${ifname//./-}"
  		routerstub="$( md5sum /etc/os-release )"
+
+--- a/package/feeds/packages/nginx/files/nginx.init
++++ b/package/feeds/packages/nginx/files/nginx.init
+@@ -23,6 +23,10 @@ nginx_init() {
+ 	rm -f "$(readlink "${UCI_CONF}")"
+ 	${NGINX_UTIL} init_lan
+ 
++	if [ ! -h "${UCI_CONF}" ]
++	then ln -sf /var/lib/nginx/uci.conf ${UCI_CONF}
++	fi
++
+ 	if [ -e "${UCI_CONF}" ]
+ 	then CONF="${UCI_CONF}"
+ 	else CONF="${NGINX_CONF}"