mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-19 14:08:17 +02:00
base-files: upgrade: stage2: use v for log lines
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
This commit is contained in:
parent
128bb4e8d3
commit
00fb51f97e
@ -53,7 +53,7 @@ switch_to_ramfs() {
|
|||||||
[ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
|
[ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
|
||||||
|
|
||||||
supivot $RAM_ROOT /mnt || {
|
supivot $RAM_ROOT /mnt || {
|
||||||
echo "Failed to switch over to ramfs. Please reboot."
|
v "Failed to switch over to ramfs. Please reboot."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -75,7 +75,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
|
|||||||
local stat
|
local stat
|
||||||
local proc_ppid=$(cut -d' ' -f4 /proc/$$/stat)
|
local proc_ppid=$(cut -d' ' -f4 /proc/$$/stat)
|
||||||
|
|
||||||
echo -n "Sending $sig to remaining processes ... "
|
vn "Sending $sig to remaining processes ..."
|
||||||
|
|
||||||
while $run; do
|
while $run; do
|
||||||
run=false
|
run=false
|
||||||
@ -95,7 +95,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
|
|||||||
# Skip kernel threads
|
# Skip kernel threads
|
||||||
[ -n "$cmdline" ] || continue
|
[ -n "$cmdline" ] || continue
|
||||||
|
|
||||||
echo -n "$name "
|
_vn " $name"
|
||||||
kill -$sig $pid 2>/dev/null
|
kill -$sig $pid 2>/dev/null
|
||||||
|
|
||||||
[ $loop -eq 1 ] && run=true
|
[ $loop -eq 1 ] && run=true
|
||||||
@ -103,12 +103,12 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
|
|||||||
|
|
||||||
let loop_limit--
|
let loop_limit--
|
||||||
[ $loop_limit -eq 0 ] && {
|
[ $loop_limit -eq 0 ] && {
|
||||||
echo
|
_v
|
||||||
echo "Failed to kill all processes."
|
v "Failed to kill all processes."
|
||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
done
|
done
|
||||||
echo
|
_v
|
||||||
}
|
}
|
||||||
|
|
||||||
indicate_upgrade
|
indicate_upgrade
|
||||||
@ -129,7 +129,7 @@ if [ -n "$IMAGE" ] && type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if [ -n "$(rootfs_type)" ]; then
|
if [ -n "$(rootfs_type)" ]; then
|
||||||
echo "Switching to ramdisk..."
|
v "Switching to ramdisk..."
|
||||||
switch_to_ramfs
|
switch_to_ramfs
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user