kiddin9 4 years ago
parent
commit
c0311d79cb

+ 2 - 2
devices/common/default-settings

@@ -85,11 +85,9 @@ test $version -lt 1 && {
 	uci -q set fstab.@global[0].anon_mount=1
 	uci commit fstab
  
- 	test ! -f /etc/config/placeholder && {
 	uci -q set network.lan.ipaddr="10.0.0.1"
 	uci -q set network.@globals[0].packet_steering=1
 	uci commit network
-	}
   
 	uci -q set dhcp.@dnsmasq[0].dns_redirect='1'
 	uci -q set dhcp.dnsmasq[0].allservers='1'
@@ -108,6 +106,8 @@ test $version -lt 1 && {
 	uci -q set system.@system[0].conloglevel='4'
 	uci -q set system.@system[0].cronloglevel='8'
 	uci commit system
+	
+	/etc/init.d/fa-pwmfan disable >/dev/null 2>&1
 }
 
 # kB

+ 2 - 3
devices/nanopi-r2c/diy.sh

@@ -11,9 +11,8 @@ svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/
 curl -sfL https://git.io/J0klE -o package/kernel/linux/modules/video.mk
 mkdir -p files/etc/rc.d
 curl -sfL https://git.io/J0kc3 --create-dirs -o files/usr/bin/start-rk3328-pwm-fan.sh
-curl -sfL https://git.io/J0kW8 --create-dirs -o files/etc/init.d/fa-rk3328-pwmfan
-chmod +x files/usr/bin/start-rk3328-pwm-fan.sh files/etc/init.d/fa-rk3328-pwmfan
-ln -sf /etc/init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan
+curl -sfL https://git.io/J0kW8 --create-dirs -o files/etc/init.d/fa-pwmfan
+chmod +x files/usr/bin/start-rk3328-pwm-fan.sh files/etc/init.d/fa-pwmfan
 
 sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk
 

+ 2 - 3
devices/nanopi-r2s/diy.sh

@@ -11,9 +11,8 @@ svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/
 curl -sfL https://git.io/J0klE -o package/kernel/linux/modules/video.mk
 mkdir -p files/etc/rc.d
 curl -sfL https://git.io/J0kc3 --create-dirs -o files/usr/bin/start-rk3328-pwm-fan.sh
-curl -sfL https://git.io/J0kW8 --create-dirs -o files/etc/init.d/fa-rk3328-pwmfan
-chmod +x files/usr/bin/start-rk3328-pwm-fan.sh files/etc/init.d/fa-rk3328-pwmfan
-ln -sf /etc/init.d/fa-rk3328-pwmfan files/etc/rc.d/S96fa-rk3328-pwmfan
+curl -sfL https://git.io/J0kW8 --create-dirs -o files/etc/init.d/fa-pwmfan
+chmod +x files/usr/bin/start-rk3328-pwm-fan.sh files/etc/init.d/fa-pwmfan
 
 sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk
 

+ 2 - 3
devices/nanopi-r4s/diy.sh

@@ -11,9 +11,8 @@ svn co https://github.com/immortalwrt/immortalwrt/branches/openwrt-21.02/target/
 curl -sfL https://git.io/J0klE -o package/kernel/linux/modules/video.mk
 mkdir -p files/etc/rc.d
 curl -sfL https://git.io/J0kRv --create-dirs -o files/usr/bin/start-rk3399-pwm-fan.sh
-curl -sfL https://git.io/J0kRG --create-dirs -o files/etc/init.d/fa-rk3399-pwmfan
-chmod +x files/usr/bin/start-rk3399-pwm-fan.sh files/etc/init.d/fa-rk3399-pwmfan
-ln -sf /etc/init.d/fa-rk3399-pwmfan files/etc/rc.d/S96fa-rk3399-pwmfan
+curl -sfL https://git.io/J0kRG --create-dirs -o files/etc/init.d/fa-pwmfan
+chmod +x files/usr/bin/start-rk3399-pwm-fan.sh files/etc/init.d/fa-pwmfan
 
 sed -i 's,-mcpu=generic,-march=armv8-a+crypto+crc -mabi=lp64,g' include/target.mk
 #sed -i 's,kmod-r8169,kmod-r8168,g' target/linux/rockchip/image/armv8.mk