Merge remote-tracking branch 'refs/remotes/origin/zz'

(cherry picked from commit 6cac8bde4f)

othersoft/install.sh

@@ -47,5 +47,5 @@ sudo apt-get install -y timedatectl
 timedatectl set-timezone Asia/Shanghai
 date -R
 sudo hwclock -w -f /dev/rtc0
-
+sudo reboot
 #tc

root/Mywathdog.sh

@@ -15,13 +15,14 @@ do
             sleep 60
         fi
     else
-        ps -ef | grep "TowerOptoSifAndSpectral" | grep -v "grep"
+        pid=$(ps -ef | grep "TowerOptoSifAndSpectral" | grep -v "grep" | awk '{print $2}')
-        if [ "$?" -eq 1 ]
+        if [ -z "$pid" ]
         then
             sleep 60
         else
+            echo "$?"
             echo "time to kill the task" > /home/data/log.txt
-            pkill TowerOptoSifAndSpectral
+            kill "$pid"
         fi
     fi
     sleep 30

root/start.sh

@@ -3,6 +3,7 @@ chmod +x /root/filebrew/filebrowser
 chmod +x /root/frp_0.34.3_linux_arm/frpc
 chmod +x /root/ffwatch.sh
 /root/ffwatch.sh &
+mount /dev/mmcblk1p1 /home/data/
 chmod +x /root/Mywathdog.sh
 bash /root/Mywathdog.sh &