diff --git a/SD_ROOT/wz_mini/etc/init.d/wz_user.sh b/SD_ROOT/wz_mini/etc/init.d/wz_user.sh index 25025ec..f6e0810 100755 --- a/SD_ROOT/wz_mini/etc/init.d/wz_user.sh +++ b/SD_ROOT/wz_mini/etc/init.d/wz_user.sh @@ -48,10 +48,10 @@ wait_wlan() { ##Check if the driver has been loaded for the onboard wlan0, store the MAC. while true do - if ifconfig wlan0 | grep "inet addr"; then + if ifconfig wlan0 | grep "HWaddr"; then store_mac break - elif ifconfig wlan0 | grep "inet addr" && [[ "$ENABLE_USB_ETH" == "true" || "$ENABLE_USB_DIRECT" == "true" ]]; then + elif ifconfig wlan0 | grep "HWaddr" && [[ "$ENABLE_USB_ETH" == "true" || "$ENABLE_USB_DIRECT" == "true" ]]; then store_mac break fi @@ -169,6 +169,7 @@ eth_wlan_up() { wpa_check() { #Check if wpa_supplicant has been created by iCamera if [ -e /tmp/wpa_supplicant.conf ]; then + wait_wlan echo "wpa_supplicant.conf ready" wlanold_check $1 else @@ -249,7 +250,6 @@ done } first_run_check -wait_wlan #Set module dir depending on platform if [ -f /opt/wz_mini/tmp/.T20 ]; then diff --git a/SD_ROOT/wz_mini/usr/bin/app.ver b/SD_ROOT/wz_mini/usr/bin/app.ver index a80eb2f..7963449 100644 --- a/SD_ROOT/wz_mini/usr/bin/app.ver +++ b/SD_ROOT/wz_mini/usr/bin/app.ver @@ -1 +1 @@ -Sun Jul 17 03:23:48 PM PDT 2022 +Sun Jul 17 04:47:48 PM PDT 2022 diff --git a/file.chk b/file.chk index bc6aaa9..16db038 100644 --- a/file.chk +++ b/file.chk @@ -14,7 +14,7 @@ b8f611d1dee2db10c8adf9f57e7274ad SD_ROOT/wz_mini/www/cgi-bin/ENABLE_USB_ETH.md 34c6a4c3a941ff2becd9f487826d7692 SD_ROOT/wz_mini/etc/uvc.config ad7d1a2f9db3079617731b5854ce3b6a SD_ROOT/wz_mini/etc/init.d/wz_cam.sh f97ffcb1482d564bf2557684a4c68846 SD_ROOT/wz_mini/etc/init.d/wz_init.sh -d50e3d2c32545cc6e418b3b7543def31 SD_ROOT/wz_mini/etc/init.d/wz_user.sh +924d966563285dc195ad7ad48676f60a SD_ROOT/wz_mini/etc/init.d/wz_user.sh 4eaf541a47e60035992435b115463541 SD_ROOT/wz_mini/etc/init.d/wz_post.sh e3034eac02d8eda9902ca9cf89f0a586 SD_ROOT/wz_mini/etc/inittab 840aa9c26726201f7cffbf001bee193a SD_ROOT/wz_mini/etc/uvc_jxf22.config @@ -97,7 +97,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 -37e8c790ecaf1611ddc83c1006ae89c7 SD_ROOT/wz_mini/usr/bin/app.ver +54074c4a22fc0212616ebb86db46c22b 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