bug-fix: 終了処理

- 終了resource busyでumountできない - 動作しているprocessを落としてumount
mnakada · Feb 12, 2024 · a7c55d4 · a7c55d4
1 parent e64052e
commit a7c55d4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/overlay_rootfs/etc/init.d/S34mountfs b/overlay_rootfs/etc/init.d/S34mountfs
@@ -84,6 +84,7 @@ case "$1" in
     umount /etc/wpa_supplicant.conf
     umount /etc/lighttpd
     umount /etc/ssh
+    umount /atom/media/mmc
     umount /atom/media
     umount /atom/tmp
     umount /atom/run

diff --git a/overlay_rootfs/etc/init.d/S38atomcam b/overlay_rootfs/etc/init.d/S38atomcam
@@ -72,6 +72,7 @@ case "$1" in
     killall -SIGKILL hl_client
     killall -SIGKILL assis
     killall -SIGKILL sysMonitor.sh
+    killall -SIGKILL sleep
     fuser -k /atom/sbin
     fuser -k /atom/bin
     sleep 1
@@ -80,8 +81,11 @@ case "$1" in
     umount /atom/system/bin/restart_wlan0.sh
     umount /atom/usr/boa/boa
     umount /atom_patch/sbin/flash_erase
+    umount /atom/sbin/flash_erase
     umount /atom_patch/bin/hostapd
+    umount /atom/bin/hostapd
     umount /atom_patch/bin/busybox
+    umount /atom/bin/busybox
     umount /atom/tmp/system/usr/lib
     umount /atom/tmp/system/lib
     umount /atom/tmp/system/bin/busybox

diff --git a/overlay_rootfs/etc/init.d/S39webcontrol b/overlay_rootfs/etc/init.d/S39webcontrol
@@ -10,6 +10,7 @@ case "$1" in
   ;;
   stop)
     killall webcmd.sh
+    killall tail
     killall cruise.sh > /dev/null 2>&1
   ;;
   restart|reload)

diff --git a/overlay_rootfs/scripts/network_init.sh b/overlay_rootfs/scripts/network_init.sh
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 if [ "$1" = "stop" -o "$1" = "restart" ] ; then
-  kill `pidof wpa_supplicant`
-  kill `pidof udhcpc`
+  killall -SIGKILL wpa_supplicant
+  killall -SIGKILL udhcpc
   [ "$1" = "stop" ] && exit 0
 fi