From: Imre Kaloz <kaloz@openwrt.org>
Date: Mon, 24 Nov 2014 15:55:52 +0000 (+0000)
Subject: fix sysupgrade on overlayfs v23+
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2e3b84c3b596eb4905f4c433923786fbfa7c9cec;p=openwrt%2Fstaging%2Fjow.git

fix sysupgrade on overlayfs v23+

Signed-off-by: Imre Kaloz <kaloz@openwrt.org>

SVN-Revision: 43365
---

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 6e63783e0a..215f482352 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -109,7 +109,12 @@ add_uci_conffiles() {
 
 add_overlayfiles() {
 	local file="$1"
-	find /overlay/etc/ -type f -o -type l | sed \
+	if [ -d /overlay/upper ]; then
+		local overlaydir="/overlay/upper"
+	else
+		local overlaydir="/overlay"
+	fi
+	find $overlaydir/etc/ -type f -o -type l | sed \
 		-e 's,^/overlay/,/,' \
 		-e '\,/META_[a-zA-Z0-9]*$,d' \
 		-e '\,/functions.sh$,d' \