aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2014-11-24 15:55:52 +0000
committerImre Kaloz <kaloz@openwrt.org>2014-11-24 15:55:52 +0000
commitcfa0c5b27f6a262a008c247f26487521b26177c1 (patch)
treec744295700a90047fc390e490751c7ab630b0274 /package/base-files
parent20ca6416c6bacf39b6a72d81717a9b2a0acfd07a (diff)
downloadupstream-cfa0c5b27f6a262a008c247f26487521b26177c1.tar.gz
upstream-cfa0c5b27f6a262a008c247f26487521b26177c1.tar.bz2
upstream-cfa0c5b27f6a262a008c247f26487521b26177c1.zip
[base-files]: fix sysupgrade on overlayfs v23+
Signed-off-by: Imre Kaloz <kaloz@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43365 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
-rwxr-xr-xpackage/base-files/files/sbin/sysupgrade7
1 files changed, 6 insertions, 1 deletions
diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
index 6e63783e0a..215f482352 100755
--- a/package/base-files/files/sbin/sysupgrade
+++ b/package/base-files/files/sbin/sysupgrade
@@ -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' \