Alfonso Gamboa 3 rokov pred
rodič
commit
2ba9869b96

+ 4 - 3
SD_ROOT/wz_mini/etc/rc.d/S07bonding

@@ -3,8 +3,6 @@
 source /opt/wz_mini/etc/rc.common
 source /opt/wz_mini/wz_mini.conf
 
-set -x
-
 bonding_setup() {
 
 	#we need to wait until wlan0 is up with the modified HWaddr
@@ -15,6 +13,9 @@ bonding_setup() {
 	## $1 Bonding Interface, $2 Primary Interface, $3 Secondary Interface
         echo "renaming interfaces"
 
+	#Prevent iCamera from cycling the wlan0 interface
+        mount --bind /opt/wz_mini/usr/bin/restart_wlan0.sh /system/bin/restart_wlan0.sh
+
         # Bring all interfaces down
         ifconfig bond0 down
         ifconfig $BONDING_PRIMARY_INTERFACE down
@@ -71,6 +72,6 @@ bonding_setup() {
 
 }
 
-if [[ "$BONDING_ENABLED" == "true" ]]; then
+if [[ "$BONDING_ENABLED" == "true" ]] && ([[ "$ENABLE_USB_ETH" == "true" ]] || [[ "$ENABLE_USB_DIRECT" == "true" ]]); then
 	bonding_setup &
 fi

+ 11 - 3
SD_ROOT/wz_mini/etc/rc.d/S09coredump

@@ -1,10 +1,18 @@
 #!/bin/sh
 
+source /opt/wz_mini/etc/rc.common
+
+set -x
+
 core() {
-	while ! pgrep -f "dumpload" > /dev/null; do
-		pkill -f dumpload #Kill dumpload so it won't waste cpu or ram gathering cores and uploading them when something crashes
-	done
+
+	#Kill dumpload so it won't waste cpu or ram gathering cores and uploading them when something crashes
+	wait_for_wlan_wpa
+
+	echo "killing dumpload"
+	/opt/wz_mini/bin/busybox pkill -f dumpload
 }
 
 sysctl -w kernel.core_pattern='|/bin/false'
+
 core &

+ 1 - 1
SD_ROOT/wz_mini/usr/bin/app.ver

@@ -1 +1 @@
-Sun Jul 31 03:20:36 PM PDT 2022
+Sun Jul 31 04:29:05 PM PDT 2022

+ 3 - 0
SD_ROOT/wz_mini/usr/bin/restart_wlan0.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+echo "up"

+ 4 - 3
file.chk

@@ -61,7 +61,7 @@ dbb0d028de1b8212cc0fd1b64a3e8d22  SD_ROOT/wz_mini/etc/rc.d/K01network
 3c688f5e675c18b3431543c640649810  SD_ROOT/wz_mini/etc/rc.d/S10firmware
 b8705ccc4f08347d3676bb57f737c2a1  SD_ROOT/wz_mini/etc/rc.d/K03rcd
 6a252a0be94933afd55f72b613fab583  SD_ROOT/wz_mini/etc/rc.d/K02webcam
-028178dde8dd60389cbff9641463588e  SD_ROOT/wz_mini/etc/rc.d/S07bonding
+e8ac5a3e46fecd6045d3f2b955510924  SD_ROOT/wz_mini/etc/rc.d/S07bonding
 4666beb9851dd915d924d05a9791489a  SD_ROOT/wz_mini/etc/rc.d/S06networkalt
 dd8ced14fa4eeceaf3c49774e8762e9b  SD_ROOT/wz_mini/etc/rc.d/S14nightdrop
 e6e927ae715137152178ff317d17b8f2  SD_ROOT/wz_mini/etc/rc.d/S03ethernet
@@ -70,7 +70,7 @@ e6e927ae715137152178ff317d17b8f2  SD_ROOT/wz_mini/etc/rc.d/S03ethernet
 19ff129af984cf133c92e9c524dda401  SD_ROOT/wz_mini/etc/rc.d/S01swap
 bbccf00adaf0b2494a98f18769e10a0f  SD_ROOT/wz_mini/etc/rc.d/K15logging
 69840400ee805665a3a4913003cf60db  SD_ROOT/wz_mini/etc/rc.d/S04usbdirect
-ca9df8b184f4bbc1c4bb9a18d3375b0b  SD_ROOT/wz_mini/etc/rc.d/S09coredump
+093ae35263b39668da01bee03e81cbe9  SD_ROOT/wz_mini/etc/rc.d/S09coredump
 9e5591da95042bcca910403bde25dc60  SD_ROOT/wz_mini/etc/fstab
 3962900301ef8743c68e42ecef4d2811  SD_ROOT/wz_mini/etc/passwd
 775b92a2052189e3e407cbceb548cae7  SD_ROOT/wz_mini/etc/rc.local
@@ -143,6 +143,7 @@ eaf86f91cb1b15b2191a8845ae88e3c8  SD_ROOT/wz_mini/usr/share/audio/init_v2.wav
 02fed0e4b2382d839f630ce0477aba26  SD_ROOT/wz_mini/usr/share/audio/init.wav
 5754f767c1334df202983aed2a20a050  SD_ROOT/wz_mini/usr/share/audio/binbin_v3.wav
 6e01838f67f7e6e51a6891e1c411318a  SD_ROOT/wz_mini/usr/share/audio/honk.wav
+71b26aa98e14c4a1f5798b3e3a2d9bab  SD_ROOT/wz_mini/usr/bin/restart_wlan0.sh
 ac9f3a5d097d25d5d972c3d2ad288df9  SD_ROOT/wz_mini/usr/bin/ucamera_v2
 7626ba23cc36b88491b010dd6eff72de  SD_ROOT/wz_mini/usr/bin/iCamera
 1e64fdad40c82ecce420f71701ec3d6d  SD_ROOT/wz_mini/usr/bin/watch_up.sh
@@ -150,7 +151,7 @@ b339aee882a5d1c943ad08e4282ec3fd  SD_ROOT/wz_mini/usr/bin/iCamera-dbg
 20b061689308b2cee7edf3b9b906bca7  SD_ROOT/wz_mini/usr/bin/ucamera
 3777d9e80c8b517c01a124e6360b6525  SD_ROOT/wz_mini/usr/bin/imp_helper.sh
 580b1b6e91e72b4a4fef7b21d8954403  SD_ROOT/wz_mini/usr/bin/getSensorType
-1b1252f2bef334ba3183e0d9ebbb7e76  SD_ROOT/wz_mini/usr/bin/app.ver
+0a5f7b2d4a3fd22db19ff5fb337b8549  SD_ROOT/wz_mini/usr/bin/app.ver
 4c780f0455481d106d47d89f0ae04ed5  SD_ROOT/wz_mini/lib/uClibc.tar
 9afeb088e4cbabbe0b04033b560204d0  SD_ROOT/wz_mini/lib/libimp.so
 4100755cb6cc6e3b76da20c7e3690e16  SD_ROOT/wz_mini/lib/libalog.so