add some random madwifi fixes

[openwrt.git] / package / base-files / files / lib / config / uci.sh

diff --git a/package/base-files/files/lib/config/uci.sh b/package/base-files/files/lib/config/uci.sh
index e0cd176..71f2048 100644 (file)
--- a/package/base-files/files/lib/config/uci.sh
+++ b/package/base-files/files/lib/config/uci.sh
@@ -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() {(
@@ -67,7 +61,7 @@ uci_add_update() {
        case "$PACKAGE" in
                /*) UCIFILE="$PACKAGE";;
                *)
-                       UCIDIR="/tmp/.uci/$PACKAGE_BASE"
+                       UCIFILE="/tmp/.uci/$PACKAGE_BASE"
                        mkdir -p "/tmp/.uci"
                ;;
        esac
@@ -90,7 +84,7 @@ uci_set() {
                        ( # spawn a subshell so you don't mess up the current environment
                                uci_load "$PACKAGE"
                                config_get OLDVAL "$CONFIG" "$OPTION"
-                               if [ "$OLDVAL" != "$VALUE" ]; then
+                               if [ "x$OLDVAL" != "x$VALUE" ]; then
                                        config_get type "$CONFIG" TYPE
                                        [ -z "$type" ]
                                fi