add patch from #2111

[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..a613e1190b0423818747a6dd8f0f7b8db53b7cd3 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() {
 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() {
 }
 
 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"
        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"
 }
        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"
        local value="$*"
        
        export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"

-       option_cb "$varname" "$*"
+       [ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"

 }
 
 config_rename() {
 }
 
 config_rename() {


@@ -55,7 +55,7 @@ config_rename() {
        local oldvar
        local newvar
        
        local oldvar
        local newvar
        

-       [ "$OLD" -a "$NEW" ] || return
+       [ -n "$OLD" -a -n "$NEW" ] || return

        for oldvar in `set | grep ^CONFIG_${OLD}_ | \
                sed -e 's/\(.*\)=.*$/\1/'` ; do
                newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}"
        for oldvar in `set | grep ^CONFIG_${OLD}_ | \
                sed -e 's/\(.*\)=.*$/\1/'` ; do
                newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}"


@@ -85,15 +85,32 @@ config_clear() {
 }
 
 config_load() {
 }
 
 config_load() {

-       local 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=
        _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}
 }
        
        ${CONFIG_SECTION:+config_cb}
 }


@@ -105,26 +122,48 @@ config_get() {
        esac
 }
 
        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"
 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"
 }
 
 config_foreach() {
        local function="$1"

-       local section
+       [ "$#" -ge 1 ] && shift
+       local type="$1"
+       [ "$#" -ge 1 ] && shift
+       local section cfgtype

        
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
        
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do

-               eval "$function \"\$section\""
+               config_get cfgtype "$section" TYPE
+               [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
+               eval "$function \"\$section\" \"\$@\""

        done
 }
 
 load_modules() {
        done
 }
 
 load_modules() {

-       cd /etc/modules.d
-       sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+       [ -d /etc/modules.d ] && {
+               cd /etc/modules.d
+               sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
+       }

 }
 
 include() {
 }
 
 include() {


@@ -137,9 +176,11 @@ include() {
 
 find_mtd_part() {
        local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
 
 find_mtd_part() {
        local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"

+       local PREFIX=/dev/mtdblock

        
        PART="${PART##mtd}"
        
        PART="${PART##mtd}"

-       echo "${PART:+/dev/mtdblock/$PART}"
+       [ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
+       echo "${PART:+$PREFIX$PART}"

 }
 
 strtok() { # <string> { <variable> [<separator>] ... }
 }
 
 strtok() { # <string> { <variable> [<separator>] ... }


@@ -160,9 +201,19 @@ strtok() { # <string> { <variable> [<separator>] ... }
                shift 2
        done
 
                shift 2
        done
 

-       if [ $# -gt 0 -a "$val" ]; then
+       if [ $# -gt 0 -a -n "$val" ]; then

                export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))
        fi
 
        return $count
 }
                export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))
        fi
 
        return $count
 }

+
+
+jffs2_mark_erase() {
+       local part="$(find_mtd_part "$1")"
+       [ -z "$part" ] && {
+               echo Partition not found.
+               return 1
+       }
+       echo -e "\xde\xad\xc0\xde" | mtd -qq write - "$1"
+}