Переглянути джерело

adjust network init scripts path

Alfonso Gamboa 3 роки тому
батько
коміт
db71bea0ad

+ 5 - 0
SD_ROOT/wz_mini/etc/init.d/wz_init.sh

@@ -1,5 +1,10 @@
 #!/bin/sh
 
+#init.d/ = early boot, before inittab is run
+#rc.d/ = runs after /linuxrc, but before app_init.sh
+#network.d/ runs after app_init.sh, and after wlan hw is ready
+#rc.local.d/ = runs after app_init.sh and network has acquired an address
+
 ###This file is run by switch_root, from the initramfs in the kernel.
 LOG_NAME=/opt/wz_mini/log/wz_init
 if [[ -e $LOG_NAME.log || -L $LOG_NAME.log ]] ; then

+ 0 - 0
SD_ROOT/wz_mini/etc/network/S01wlanhw → SD_ROOT/wz_mini/etc/network.d/S01wlanhw


+ 0 - 0
SD_ROOT/wz_mini/etc/network/S03ipv6 → SD_ROOT/wz_mini/etc/network.d/S03ipv6


+ 0 - 0
SD_ROOT/wz_mini/etc/network/S04wireguard → SD_ROOT/wz_mini/etc/network.d/S04wireguard


+ 0 - 0
SD_ROOT/wz_mini/etc/network/S08hostname → SD_ROOT/wz_mini/etc/network.d/S08hostname


+ 0 - 0
SD_ROOT/wz_mini/etc/network/S09dnsmasq → SD_ROOT/wz_mini/etc/network.d/S09dnsmasq


+ 0 - 0
SD_ROOT/wz_mini/etc/network/S10httpd → SD_ROOT/wz_mini/etc/network.d/S10httpd


+ 8 - 0
SD_ROOT/wz_mini/etc/rc.d/S12remoteaccessory → SD_ROOT/wz_mini/etc/network.d/S12remoteaccessory

@@ -1,10 +1,18 @@
 #!/bin/sh
 
+source /opt/wz_mini/etc/rc.common
 source /opt/wz_mini/wz_mini.conf
 
+remote() {
+
+wait_for_wlan_ip
+
 if [[ "$REMOTE_SPOTLIGHT" == "true" ]]; then
         /opt/wz_mini/bin/socat pty,link=/dev/ttyUSB0,raw tcp:"$REMOTE_SPOTLIGHT_HOST":9000 &
         echo "Remote accessory support enabled"
 else
         echo "Remote accessory support disabled"
 fi
+}
+
+remote &

+ 0 - 0
SD_ROOT/wz_mini/etc/network/S14storemac → SD_ROOT/wz_mini/etc/network.d/S14storemac


+ 0 - 0
SD_ROOT/wz_mini/etc/network/S15v4l2rtspserver → SD_ROOT/wz_mini/etc/network.d/S15v4l2rtspserver


+ 0 - 0
SD_ROOT/wz_mini/etc/network/S16rtmp → SD_ROOT/wz_mini/etc/network.d/S16rtmp


+ 2 - 1
SD_ROOT/wz_mini/etc/rc.d/K01network

@@ -10,7 +10,7 @@ fi
 
 wait_for_wlan
 
-for i in /opt/wz_mini/etc/network/S??* ;do
+for i in /opt/wz_mini/etc/network.d/S??* ;do
 
      # Ignore dangling symlinks (if any).
      [ ! -f "$i" ] && continue
@@ -31,6 +31,7 @@ for i in /opt/wz_mini/etc/network/S??* ;do
     esac
 done
 
+wait_for_wlan_ip
 
 for i in /opt/wz_mini/etc/rc.local.d/* ;do
 

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

@@ -1 +1 @@
-Sun Jul 31 09:18:03 PM PDT 2022
+Sun Jul 31 09:35:00 PM PDT 2022

+ 13 - 13
file.chk

@@ -21,16 +21,17 @@ e344ffc55222c029c5d324037a5aa1f3  SD_ROOT/wz_mini/www/car/car.js
 540acfdf2638c341e1d168f1af5203de  SD_ROOT/wz_mini/www/car/car.css
 63b23f78d6703f0c9a2e970604104996  SD_ROOT/wz_mini/www/car/car.html
 bd11d9a8352eca6a16554c87be50b2f5  SD_ROOT/wz_mini/www/index.html
+9a30c16776ac6931a313de1a85f63367  SD_ROOT/wz_mini/etc/network.d/S16rtmp
+89c8beceeaf22c8633476994baee9da2  SD_ROOT/wz_mini/etc/network.d/S09dnsmasq
+6f914e6567dc00dcf988ddd7053f8b61  SD_ROOT/wz_mini/etc/network.d/S04wireguard
+557060f9488606bb6817bde355b0c014  SD_ROOT/wz_mini/etc/network.d/S12remoteaccessory
+ac71f3b06fd9d303ffef72f5790136f6  SD_ROOT/wz_mini/etc/network.d/S15v4l2rtspserver
+195323ca0d9fe26cbb26e67d808737ae  SD_ROOT/wz_mini/etc/network.d/S01wlanhw
+4f191c79d1b755124a0dfa95dddca3e1  SD_ROOT/wz_mini/etc/network.d/S10httpd
+1e5365fc53f132424dec1ad73f21e9b9  SD_ROOT/wz_mini/etc/network.d/S03ipv6
+eaee762583ba295772686505711277f4  SD_ROOT/wz_mini/etc/network.d/S08hostname
+d76cec0de3b51d741196771874197b8f  SD_ROOT/wz_mini/etc/network.d/S14storemac
 32373fa3531a11c1aad41d12830b9c04  SD_ROOT/wz_mini/etc/dnsmasq.conf
-9a30c16776ac6931a313de1a85f63367  SD_ROOT/wz_mini/etc/network/S16rtmp
-89c8beceeaf22c8633476994baee9da2  SD_ROOT/wz_mini/etc/network/S09dnsmasq
-6f914e6567dc00dcf988ddd7053f8b61  SD_ROOT/wz_mini/etc/network/S04wireguard
-ac71f3b06fd9d303ffef72f5790136f6  SD_ROOT/wz_mini/etc/network/S15v4l2rtspserver
-195323ca0d9fe26cbb26e67d808737ae  SD_ROOT/wz_mini/etc/network/S01wlanhw
-4f191c79d1b755124a0dfa95dddca3e1  SD_ROOT/wz_mini/etc/network/S10httpd
-1e5365fc53f132424dec1ad73f21e9b9  SD_ROOT/wz_mini/etc/network/S03ipv6
-eaee762583ba295772686505711277f4  SD_ROOT/wz_mini/etc/network/S08hostname
-d76cec0de3b51d741196771874197b8f  SD_ROOT/wz_mini/etc/network/S14storemac
 34c6a4c3a941ff2becd9f487826d7692  SD_ROOT/wz_mini/etc/uvc.config
 893b4982bb2ff2862393956e95f7ad62  SD_ROOT/wz_mini/etc/init.d/S09firstboot
 c857ea1bfa34bec22d706566977a2d39  SD_ROOT/wz_mini/etc/init.d/S11configbackup
@@ -40,7 +41,7 @@ c857ea1bfa34bec22d706566977a2d39  SD_ROOT/wz_mini/etc/init.d/S11configbackup
 234065de9a9a36fc2e8292993f00dd54  SD_ROOT/wz_mini/etc/init.d/S05mount
 cabd10978939550aac36ec6072059194  SD_ROOT/wz_mini/etc/init.d/S01bind
 507fe51058c50407828fb7026188e5ec  SD_ROOT/wz_mini/etc/init.d/S03busybox
-6723a9add8fed1d6dd8ff83d437e9707  SD_ROOT/wz_mini/etc/init.d/wz_init.sh
+a27d4a0dd6582ae51db92c35cf396ac3  SD_ROOT/wz_mini/etc/init.d/wz_init.sh
 6387f4fcf1b40dc76d50eb1622526633  SD_ROOT/wz_mini/etc/init.d/S16factorycheck
 0704333eb4aa14e2c5b09282c626266a  SD_ROOT/wz_mini/etc/init.d/S04model
 997158df9e139fdfb1bf03b5d4ba895a  SD_ROOT/wz_mini/etc/init.d/S14terminfo
@@ -55,8 +56,7 @@ a856cf7998a5e556654e649a15c3fba5  SD_ROOT/wz_mini/etc/rc.common
 8b5e58acfcbb20034dc4873a08b45fd9  SD_ROOT/wz_mini/etc/profile
 2c2df1b9cb603f9c31c46162d6ac307f  SD_ROOT/wz_mini/etc/alsa/alsa.conf
 48c275a421535d8c21e7960545c684dc  SD_ROOT/wz_mini/etc/rc.d/S18fps
-dbb0d028de1b8212cc0fd1b64a3e8d22  SD_ROOT/wz_mini/etc/rc.d/K01network
-45e5f3f33860e560b3e154dd9510f830  SD_ROOT/wz_mini/etc/rc.d/S12remoteaccessory
+6635e9bba82d69245bbd3e47f50828d4  SD_ROOT/wz_mini/etc/rc.d/K01network
 3053ed4b5fcd1dc8a38bb90e2ac5fff2  SD_ROOT/wz_mini/etc/rc.d/S17motor
 3c688f5e675c18b3431543c640649810  SD_ROOT/wz_mini/etc/rc.d/S10firmware
 b8705ccc4f08347d3676bb57f737c2a1  SD_ROOT/wz_mini/etc/rc.d/K03rcd
@@ -151,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
-542f35f53ab6d4562f1a1ad5e92742b7  SD_ROOT/wz_mini/usr/bin/app.ver
+fb46cce013896d57c791bd5f70ef1873  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