aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2016-01-17 18:24:30 +0000
committerJo-Philipp Wich <jow@openwrt.org>2016-01-17 18:24:30 +0000
commit740a2ee163928b3f9f64446b8c64a63becc12147 (patch)
tree9e6c0d4ecdfc0a4e5cc36bae180f3104d35a618f
parent5cf88bb032629ca85a4f8087e53d403367b54903 (diff)
downloadupstream-740a2ee163928b3f9f64446b8c64a63becc12147.tar.gz
upstream-740a2ee163928b3f9f64446b8c64a63becc12147.tar.bz2
upstream-740a2ee163928b3f9f64446b8c64a63becc12147.zip
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
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade1
1 files changed, 1 insertions, 0 deletions
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' \