allow scripts to disable config callbacks

[openwrt/svn-archive/archive.git] / package / base-files / files / etc / functions.sh

diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
index 84121c5458efdd5a94a48bc034dde26807fcab76..dac46a34977b5d0646f5e44f523348d518f6e6ca 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -12,7 +12,7 @@ _C=0
 NO_EXPORT=1
 
 hotplug_dev() {
-       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
+       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
 }
 
 append() {
@@ -36,7 +36,7 @@ config () {
        export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1))
        name="${name:-cfg$CONFIG_NUM_SECTIONS}"
        append CONFIG_SECTIONS "$name"
-       config_cb "$cfgtype" "$name"
+       [ -n "$NO_CALLBACK" ] || config_cb "$cfgtype" "$name"
        export ${NO_EXPORT:+-n} CONFIG_SECTION="$name"
        export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"
 }
@@ -46,7 +46,7 @@ option () {
        local value="$*"
        
        export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
-       option_cb "$varname" "$*"
+       [ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"
 }
 
 config_rename() {
@@ -105,19 +105,37 @@ config_get() {
        esac
 }
 
+# config_get_bool <variable> <section> <option> [<default>]
+config_get_bool() {
+       local _tmp
+       config_get "_tmp" "$2" "$3"
+       case "$_tmp" in
+               1|on|enabled) export ${NO_EXPORT:+-n} "$1=1";;
+               0|off|disabled) export ${NO_EXPORT:+-n} "$1=0";;
+               *) eval "$1=${4:-0}";;
+       esac
+}
+
 config_set() {
        local section="$1"
        local option="$2"
        local value="$3"
-       export ${NO_EXPORT:+-n} "CONFIG_${section}_${option}=$value"
+       local old_section="$CONFIG_SECTION"
+
+       CONFIG_SECTION="$section"
+       option "$option" "$value"
+       CONFIG_SECTION="$old_section"
 }
 
 config_foreach() {
        local function="$1"
-       local section
+       local type="$2"
+       local section cfgtype
        
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
+               config_get cfgtype "$section" TYPE
+               [ -n "$type" -a "$cfgtype" != "$type" ] && continue
                eval "$function \"\$section\""
        done
 }
@@ -137,9 +155,11 @@ include() {
 
 find_mtd_part() {
        local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
+       local PREFIX=/dev/mtdblock
        
        PART="${PART##mtd}"
-       echo "${PART:+/dev/mtdblock/$PART}"
+       [ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
+       echo "${PART:+$PREFIX$PART}"
 }
 
 strtok() { # <string> { <variable> [<separator>] ... }