[openwrt/openwrt] base-files: Reapply fixed "Ignore exit code of uci.sh inclusion"
LEDE Commits
lede-commits at lists.infradead.org
Wed Jun 12 02:12:32 PDT 2024
aparcar pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/213bd273edade89e2da471083eb9329c0e9c62f2
commit 213bd273edade89e2da471083eb9329c0e9c62f2
Author: Paul Spooren <mail at aparcar.org>
AuthorDate: Mon Jun 10 16:59:41 2024 +0200
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 at aparcar.org>
---
package/base-files/files/lib/functions.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
More information about the lede-commits
mailing list