projects
/
openwrt
/
staging
/
noltari.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b8618fd
)
base-files: ensure that /sys is available during sysupgrade, some essential services...
author
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 3 Jul 2012 15:43:43 +0000
(15:43 +0000)
committer
Jo-Philipp Wich
<jow@openwrt.org>
Tue, 3 Jul 2012 15:43:43 +0000
(15:43 +0000)
SVN-Revision: 32587
package/base-files/files/lib/upgrade/common.sh
patch
|
blob
|
history
diff --git
a/package/base-files/files/lib/upgrade/common.sh
b/package/base-files/files/lib/upgrade/common.sh
index 0a92aadcfbd60dc23b9beb3deac9e80f72d113fd..e6de34849a8b514f31e75e235340d52037551eb4 100644
(file)
--- a/
package/base-files/files/lib/upgrade/common.sh
+++ b/
package/base-files/files/lib/upgrade/common.sh
@@
-35,12
+35,14
@@
install_bin() { # <file> [ <symlink> ... ]
pivot() { # <new_root> <old_root>
mount | grep "on $1 type" 2>&- 1>&- || mount -o bind $1 $1
pivot() { # <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 && \
+ mkdir -p $1$2 $1/proc $1/
sys $1/
dev $1/tmp $1/overlay && \
mount -o move /proc $1/proc && \
pivot_root $1 $1$2 || {
umount $1 $1
return 1
}
mount -o move /proc $1/proc && \
pivot_root $1 $1$2 || {
umount $1 $1
return 1
}
+
+ mount -o move $2/sys /sys
mount -o move $2/dev /dev
mount -o move $2/tmp /tmp
mount -o move $2/overlay /overlay 2>&-
mount -o move $2/dev /dev
mount -o move $2/tmp /tmp
mount -o move $2/overlay /overlay 2>&-
@@
-83,6
+85,8
@@
kill_remaining() { # [ <signal> ]
local stat
for stat in /proc/[0-9]*/stat; do
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 pid name state ppid rest
read pid name state ppid rest < $stat
name="${name#(}"; name="${name%)}"