diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2014-11-24 15:55:52 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2014-11-24 15:55:52 +0000 |
| commit | 2e3b84c3b596eb4905f4c433923786fbfa7c9cec (patch) | |
| tree | 3a3cbdd83bd3afb57888b935b23ed7e03016d097 /package/base-files/files/sbin/sysupgrade | |
| parent | cf0c966d9a614ca7354048d2c3397a8ed714eb5b (diff) | |
| download | upstream-2e3b84c3b596eb4905f4c433923786fbfa7c9cec.tar.gz upstream-2e3b84c3b596eb4905f4c433923786fbfa7c9cec.tar.bz2 upstream-2e3b84c3b596eb4905f4c433923786fbfa7c9cec.zip | |
fix sysupgrade on overlayfs v23+
Signed-off-by: Imre Kaloz <kaloz@openwrt.org>
SVN-Revision: 43365
Diffstat (limited to 'package/base-files/files/sbin/sysupgrade')
| -rwxr-xr-x | package/base-files/files/sbin/sysupgrade | 7 |
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' \ |