diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-07-03 15:43:43 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-07-03 15:43:43 +0000 |
| commit | 1f88d93e7e8a850094894ffb2cc76eacdddec33a (patch) | |
| tree | 061ee89d4b8fa4d658454833288af4aab17a9cd7 /package/base-files | |
| parent | a2954f12fba7e57d20d4c4956fe4cbf6d8e44ca6 (diff) | |
| download | upstream-1f88d93e7e8a850094894ffb2cc76eacdddec33a.tar.gz upstream-1f88d93e7e8a850094894ffb2cc76eacdddec33a.tar.bz2 upstream-1f88d93e7e8a850094894ffb2cc76eacdddec33a.zip | |
[package] base-files: ensure that /sys is available during sysupgrade, some essential services like om-watchdog need it
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32587 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rw-r--r-- | package/base-files/files/lib/upgrade/common.sh | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh index 0a92aadcfb..e6de34849a 100644 --- 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 - 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 $2/sys /sys 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 + [ -f "$stat" ] || continue + local pid name state ppid rest read pid name state ppid rest < $stat name="${name#(}"; name="${name%)}" |