From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 3 Jul 2012 15:43:43 +0000 (+0000)
Subject: base-files: ensure that /sys is available during sysupgrade, some essential services... 
X-Git-Tag: v19.07.0-rc1~24123
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=ff3161a6c4319fc1650879b3f7f653d907e336c4;p=openwrt%2Fstaging%2Fhauke.git

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

SVN-Revision: 32587
---

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%)}"