From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 17 Jan 2016 18:24:30 +0000 (+0000)
Subject: base-files: Fix sysupgrade overlay saving
X-Git-Tag: reboot~846
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=740a2ee163928b3f9f64446b8c64a63becc12147;p=openwrt%2Fstaging%2Fchunkeey.git

base-files: Fix sysupgrade overlay saving

A previous change to sysupgrade moved the overlay files into upper/
The -c switch generates a list of files to backup, but the sed
calls did not take this into consideration.

Signed-off-by: Rob Mosher <nyt-openwrt@countercultured.net>

SVN-Revision: 48281
---

diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index ef83c4b00f..93f0749108 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -115,6 +115,7 @@ add_overlayfiles() {
 		local overlaydir="/overlay"
 	fi
 	find $overlaydir/etc/ -type f -o -type l | sed \
+		-e 's,^/overlay\/upper/,/,' \
 		-e 's,^/overlay/,/,' \
 		-e '\,/META_[a-zA-Z0-9]*$,d' \
 		-e '\,/functions.sh$,d' \