base-files: Fix sysupgrade overlay saving
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 17 Jan 2016 18:24:30 +0000 (18:24 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 17 Jan 2016 18:24:30 +0000 (18:24 +0000)
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

package/base-files/files/sbin/sysupgrade

index ef83c4b00f1a88ae5d68fc70adf51a6af3dc109c..93f0749108ec7ae5c3d8f77c84a3cb95bf8a5ff6 100755 (executable)
@@ -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' \