From a88219f1f2880028c9aeaa078c334ed0c330a1af Mon Sep 17 00:00:00 2001 From: nbd Date: Wed, 30 Jul 2008 19:21:09 +0000 Subject: allow packages to optionally append config file contents in the environment by setting a flag and calling config_load multiple times git-svn-id: svn://svn.openwrt.org/openwrt/trunk@12020 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/uci/files/uci/lib/config/uci.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'package') diff --git a/package/uci/files/uci/lib/config/uci.sh b/package/uci/files/uci/lib/config/uci.sh index cd8f6b160d..c226f4fe1a 100644 --- a/package/uci/files/uci/lib/config/uci.sh +++ b/package/uci/files/uci/lib/config/uci.sh @@ -23,9 +23,11 @@ uci_load() { local RET _C=0 - export ${NO_EXPORT:+-n} CONFIG_SECTIONS= - export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0 - export ${NO_EXPORT:+-n} CONFIG_SECTION= + if [ -z "$CONFIG_APPEND" ]; then + export ${NO_EXPORT:+-n} CONFIG_SECTIONS= + export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0 + export ${NO_EXPORT:+-n} CONFIG_SECTION= + fi DATA="$(/sbin/uci ${LOAD_STATE:+-P /var/state} -S -n export "$PACKAGE" 2>/dev/null)" RET="$?" -- cgit v1.2.3