projects
/
openwrt-github
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[base-files]: fix sysupgrade on overlayfs v23+
[openwrt-github/.git]
/
package
/
base-files
/
files
/
sbin
/
sysupgrade
diff --git
a/package/base-files/files/sbin/sysupgrade
b/package/base-files/files/sbin/sysupgrade
index 6e63783e0a16ebe9003e721e9eb19be2c5acd02c..215f482352d239457825b8071e7de92ba801326b 100755
(executable)
--- 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"
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' \
-e 's,^/overlay/,/,' \
-e '\,/META_[a-zA-Z0-9]*$,d' \
-e '\,/functions.sh$,d' \