aboutsummaryrefslogtreecommitdiffstats
path: root/package
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
commit0219006854d18cc0ab6146468897e165d500411b (patch)
tree6098d8f3d176885d2051cbdadb956656d96c11f6 /package
parenta86172ce9495a805215d4264feac74044ea11149 (diff)
downloadmaster-187ad058-0219006854d18cc0ab6146468897e165d500411b.tar.gz
master-187ad058-0219006854d18cc0ab6146468897e165d500411b.tar.bz2
master-187ad058-0219006854d18cc0ab6146468897e165d500411b.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> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@48281 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package')
-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' \