[LEDE-DEV] [PATCH 09/12] base-files: enable presence of uci when IPKG_INSTROOT is set

Yousong Zhou yszhou4tech at gmail.com
Sun Mar 5 01:31:40 PST 2017


Signed-off-by: Yousong Zhou <yszhou4tech at gmail.com>
---
 package/base-files/files/lib/functions.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index b68db6b..de3fa96 100755
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -35,7 +35,6 @@ list_contains() {
 }
 
 config_load() {
-	[ -n "$IPKG_INSTROOT" ] && return 0
 	uci_load "$@"
 }
 
@@ -353,4 +352,4 @@ user_exists() {
 	grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/passwd
 }
 
-[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh
+. $IPKG_INSTROOT/lib/config/uci.sh
-- 
2.6.4




More information about the Lede-dev mailing list