[base-files]: fix sysupgrade on overlayfs v23+
authorImre Kaloz <kaloz@openwrt.org>
Mon, 24 Nov 2014 15:55:52 +0000 (15:55 +0000)
committerImre Kaloz <kaloz@openwrt.org>
Mon, 24 Nov 2014 15:55:52 +0000 (15:55 +0000)
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 43365

package/base-files/files/sbin/sysupgrade

index 6e63783..215f482 100755 (executable)
@@ -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' \