From: Paul Spooren <mail@aparcar.org>
Date: Fri, 7 Jun 2024 14:26:14 +0000 (+0200)
Subject: base-files: Ignore exit code of uci.sh inclusion
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=17d8c5825e6f5c5d2e4d2c320c3b4b797f4ca0e9;p=openwrt%2Fstaging%2Fthess.git

base-files: Ignore exit code of uci.sh inclusion

When running unit tests this causes trouble since `/lib/config/uci.sh`
isn't available in those cases. Instead exit with a clean status fo the
unit test framework don't wrongly interpret things as an error.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index a009aa81e9..0fc8c07d1a 100644
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -533,4 +533,4 @@ cmdline_get_var() {
 	done
 }
 
-[ -z "$IPKG_INSTROOT" ] && [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh
+[ -z "$IPKG_INSTROOT" ] && ( [ -f /lib/config/uci.sh ] && . /lib/config/uci.sh ) || true