KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

base-files: ensure that /sys is available during sysupgrade, some essential services like om-watchdog need it

Browse source 
SVN-Revision: 32587
This commit is contained in:
Jo-Philipp Wich 2012-07-03 15:43:43 +00:00
parent b8618fd3f2
commit ff3161a6c4
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
package/base-files/files/lib/upgrade/common.sh
View file

@ -35,12 +35,14 @@ install_bin() { # <file> [ <symlink> ... ]
pivot() { # <new_root> <old_root> pivot() { # <new_root> <old_root>
mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1 mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1
mkdir -p $1$2 $1/proc $1/dev $1/tmp $1/overlay && \ mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
mount -o move /proc $1/proc && \ mount -o move /proc $1/proc && \
pivot_root $1 $1$2 || { pivot_root $1 $1$2 || {
umount $1 $1 umount $1 $1
return 1 return 1
} }
mount -o move $2/sys /sys
mount -o move $2/dev /dev mount -o move $2/dev /dev
mount -o move $2/tmp /tmp mount -o move $2/tmp /tmp
mount -o move $2/overlay /overlay 2>&- mount -o move $2/overlay /overlay 2>&-
@ -83,6 +85,8 @@ kill_remaining() { # [ <signal> ]
local stat local stat
for stat in /proc/[0-9]*/stat; do for stat in /proc/[0-9]*/stat; do
[ -f "$stat" ] || continue
local pid name state ppid rest local pid name state ppid rest
read pid name state ppid rest < $stat read pid name state ppid rest < $stat
name="${name#(}"; name="${name%)}" name="${name#(}"; name="${name%)}"