Skip to content

Commit 10db6fc

Browse files
PolynomialDivisionrobimarko
authored andcommitted
base-files: sysupgrade: avoid cat missing conffiles_static
If the user removes all /lib/apk/packages/*.conffiles* files to prevent sysupgrade from preserving configuration, the glob no longer matches and sysupgrade ends up calling cat on a non-existent path: cat: can't open '/lib/apk/packages/*.conffiles_static': No such file or directory Fix this by using find cmd. Signed-off-by: Nick Hainke <vincent@systemli.org> Link: openwrt/openwrt#22071 Signed-off-by: Robert Marko <robimarko@gmail.com>
1 parent d35d92a commit 10db6fc

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

package/base-files/files/sbin/sysupgrade

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ list_conffiles() {
146146
' /usr/lib/opkg/status
147147
elif [ -d /lib/apk/packages ]; then
148148
conffiles=""
149-
for file in /lib/apk/packages/*.conffiles_static; do
149+
for file in $(find /lib/apk/packages -name "*.conffiles_static" -type f); do
150150
conffiles="$(echo -e "$(cat $file)\n$conffiles")"
151151
done
152152
echo "$conffiles"

0 commit comments

Comments
 (0)