X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Flib%2Fupgrade%2Fstage2;h=f2f3cd439a747e80da9f7c22d75325983eb9868b;hb=42d78fedfb039b7ffd623c910cd946480c75bb26;hp=ba728004e9ebd536219cf5610d5c27c339f32314;hpb=bb2b7156a4b55a5599ac45adbe46b2d6bd046036;p=openwrt%2Fstaging%2Fmkresin.git diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2 index ba728004e9..f2f3cd439a 100755 --- a/package/base-files/files/lib/upgrade/stage2 +++ b/package/base-files/files/lib/upgrade/stage2 @@ -85,7 +85,7 @@ kill_remaining() { # [ [ ] ] local stat local proc_ppid=$(cut -d' ' -f4 /proc/$$/stat) - vn "Sending $sig to remaining processes ..." + v "Sending $sig to remaining processes ..." while $run; do run=false @@ -105,7 +105,7 @@ kill_remaining() { # [ [ ] ] # Skip kernel threads [ -n "$cmdline" ] || continue - _vn " $name" + v "Sending signal $sig to $name ($pid)" kill -$sig $pid 2>/dev/null [ $loop -eq 1 ] && run=true @@ -113,12 +113,10 @@ kill_remaining() { # [ [ ] ] let loop_limit-- [ $loop_limit -eq 0 ] && { - _v v "Failed to kill all processes." exit 1 } done - _v } indicate_upgrade