From: Yousong Zhou <yszhou4tech@gmail.com>
Date: Sat, 4 Mar 2017 12:26:46 +0000 (+0800)
Subject: base-files: enable presence of uci when IPKG_INSTROOT is set
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fstaging%2Fyousong.git;a=commitdiff_plain;h=86baf3d5e43afd5b22bb41deb25b372a5a1a162a

base-files: enable presence of uci when IPKG_INSTROOT is set

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index b68db6b6bd..de3fa96730 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