qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2025-01-26 22:21:07 +02:00
Code

move uci_load into config_load so that changes can be applied via uci without commiting

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7927 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
mbm 2007-07-11 20:39:28 +00:00
parent b549f7c5f4
commit d3ba75415e
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
package/base-files/files/etc/functions.sh
View File

@ -85,19 +85,32 @@ config_clear() {
}
config_load() {
local file
case "$1" in
/*) file="$1";;
*) file="$UCI_ROOT/etc/config/$1";;
local cfg
local uci
local PACKAGE="$1"
case "$PACKAGE" in
/*) cfg="$PACKAGE"
uci=""
;;
*) cfg="$UCI_ROOT/etc/config/$PACKAGE"
uci="/tmp/.uci/${PACKAGE}"
;;
esac
[ -e "$cfg" ] || cfg=""
[ -e "$uci" ] || uci=""
# no config
[ -z "$cfg" -a -z "$uci" ] && return 1
_C=0
export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
export ${NO_EXPORT:+-n} CONFIG_SECTION=
[ -e "$file" ] && {
. $file
} || return 1
${cfg:+. "$cfg"}
${uci:+. "$uci"}
${CONFIG_SECTION:+config_cb}
}

8
package/base-files/files/lib/config/uci.sh
View File

@ -19,13 +19,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
uci_load() {
local PACKAGE="$1"
config_load "$PACKAGE"
local PACKAGE_BASE="$(basename "$PACKAGE")"
[ -f "/tmp/.uci/${PACKAGE_BASE}" ] && {
. "/tmp/.uci/${PACKAGE_BASE}" 2>/dev/null >/dev/null
config_cb
}
config_load "$1"
}
uci_apply_defaults() {(