summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Spooren2024-06-07 14:26:14 +0000
committerPaul Spooren2024-06-07 19:49:09 +0000
commit17d8c5825e6f5c5d2e4d2c320c3b4b797f4ca0e9 (patch)
tree8a0949a10f785d9c8ea2df82a897396c387165c1
parent884bef5d1bbccaeb96b382363106a2886e28b9b3 (diff)
downloadopenwrt-17d8c5825e6f5c5d2e4d2c320c3b4b797f4ca0e9.tar.gz
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>
-rw-r--r--package/base-files/files/lib/functions.sh2
1 files changed, 1 insertions, 1 deletions
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