From: Paul Spooren <mail@aparcar.org>
Date: Mon, 10 Jun 2024 14:59:41 +0000 (+0200)
Subject: base-files: Reapply fixed "Ignore exit code of uci.sh inclusion"
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=213bd273edade89e2da471083eb9329c0e9c62f2;p=openwrt%2Fstaging%2Fnbd.git

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

This reverts commit 80d1c353b79e6c216dcb2534420470e3e6ed5d60 with the
fix which won't break running systems. A logic error on how shell
handles && and || more the init process.

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..e944d36505 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