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

[openwrt/staging/yousong.git] / package / base-files / files / lib / functions.sh

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index b68db6b6bd7e419627b8330f5bf31a780f817561..de3fa96730393b76e39bd4d3ea5f41a104c16b69 100755 (executable)
--- 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