sysupgrade was broken as procd was getting killed

[librecmc/librecmc.git] / package / base-files / files / lib / upgrade / common.sh

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 2126ca1c388d191a5b527495f73dcc5c809a6368..df842bf9225bcdf125170b53f1104493549d324d 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -33,17 +33,19 @@ install_bin() { # <file> [ <symlink> ... ]
        }; done
 }
 
-pivot() { # <new_root> <old_root>
+supivot() { # <new_root> <old_root>
        mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1
-       mkdir -p $1$2 $1/proc $1/dev $1/tmp $1/overlay && \
-       mount -o move /proc $1/proc && \
+       mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
+       mount -o noatime,move /proc $1/proc && \
        pivot_root $1 $1$2 || {
-        umount $1 $1
+        umount -l $1 $1
                return 1
        }
-       mount -o move $2/dev /dev
-       mount -o move $2/tmp /tmp
-       mount -o move $2/overlay /overlay 2>&-
+
+       mount -o noatime,move $2/sys /sys
+       mount -o noatime,move $2/dev /dev
+       mount -o noatime,move $2/tmp /tmp
+       mount -o noatime,move $2/overlay /overlay 2>&-
        return 0
 }
 
@@ -58,9 +60,9 @@ run_ramfs() { # <command> [...]
        for file in $RAMFS_COPY_BIN; do
                install_bin $file
        done
-       install_file /etc/resolv.conf /etc/functions.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
+       install_file /etc/resolv.conf /lib/functions.sh /lib/functions.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
 
-       pivot $RAM_ROOT /mnt || {
+       supivot $RAM_ROOT /mnt || {
                echo "Failed to switch over to ramfs. Please reboot."
                exit 1
        }
@@ -69,7 +71,7 @@ run_ramfs() { # <command> [...]
        umount -l /mnt
 
        grep /overlay /proc/mounts > /dev/null && {
-               mount -o remount,ro /overlay
+               mount -o noatime,remount,ro /overlay
                umount -l /overlay
        }
 
@@ -79,20 +81,30 @@ run_ramfs() { # <command> [...]
 
 kill_remaining() { # [ <signal> ]
        local sig="${1:-TERM}"
-       echo -n "Sending $sig to remaing processes ... "
-       top -bn1 | while read pid ppid user stat vsz pvsz pcpu cmd args; do
-               case "$pid" in
-                       [0-9]*) : ;;
-                       *) continue ;;
-               esac
-               case "$cmd" in
-                       # Skip kernel threads and essential services
-                       \[*\]|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*) : ;;
+       echo -n "Sending $sig to remaining processes ... "
+
+       local stat
+       for stat in /proc/[0-9]*/stat; do
+               [ -f "$stat" ] || continue
+
+               local pid name state ppid rest
+               read pid name state ppid rest < $stat
+               name="${name#(}"; name="${name%)}"
+
+               local cmdline
+               read cmdline < /proc/$pid/cmdline
+
+               # Skip kernel threads 
+               [ -n "$cmdline" ] || continue
+
+               case "$name" in
+                       # Skip essential services
+                       *procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*) : ;;
 
                        # Killable process
                        *)
                                if [ $pid -ne $$ ] && [ $ppid -ne $$ ]; then
-                                       echo -n "${cmd##*/} "
+                                       echo -n "$name "
                                        kill -$sig $pid 2>/dev/null
                                fi
                        ;;