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

[openwrt.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 5c353a3..4446931 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -9,9 +9,10 @@ N="
 "
 
 _C=0
 "
 
 _C=0

+NO_EXPORT=1

 
 hotplug_dev() {
 
 hotplug_dev() {

-       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
+       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net

 }
 
 append() {
 }
 
 append() {


@@ -19,7 +20,7 @@ append() {
        local value="$2"
        local sep="${3:- }"
        
        local value="$2"
        local sep="${3:- }"
        

-       eval "export -n -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
+       eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""

 }
 
 reset_cb() {
 }
 
 reset_cb() {


@@ -32,20 +33,20 @@ config () {
        local cfgtype="$1"
        local name="$2"
        
        local cfgtype="$1"
        local name="$2"
        

-       CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1))
+       export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1))

        name="${name:-cfg$CONFIG_NUM_SECTIONS}"
        append CONFIG_SECTIONS "$name"
        name="${name:-cfg$CONFIG_NUM_SECTIONS}"
        append CONFIG_SECTIONS "$name"

-       config_cb "$cfgtype" "$name"
-       CONFIG_SECTION="$name"
-       export -n "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"
+       [ -n "$NO_CALLBACK" ] || config_cb "$cfgtype" "$name"
+       export ${NO_EXPORT:+-n} CONFIG_SECTION="$name"
+       export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"

 }
 
 option () {
        local varname="$1"; shift
        local value="$*"
        
 }
 
 option () {
        local varname="$1"; shift
        local value="$*"
        

-       export -n "CONFIG_${CONFIG_SECTION}_${varname}=$value"
-       option_cb "$varname" "$*"
+       export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
+       [ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"

 }
 
 config_rename() {
 }
 
 config_rename() {


@@ -54,16 +55,16 @@ 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}_}"

-               eval "export -n \"$newvar=\${$oldvar}\""
+               eval "export ${NO_EXPORT:+-n} \"$newvar=\${$oldvar}\""

                unset "$oldvar"
        done
                unset "$oldvar"
        done

-       CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , $NEW ,")"
+       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , $NEW ,")"

        
        

-       [ "$CONFIG_SECTION" = "$OLD" ] && CONFIG_SECTION="$NEW"
+       [ "$CONFIG_SECTION" = "$OLD" ] && export ${NO_EXPORT:+-n} CONFIG_SECTION="$NEW"

 }
 
 config_unset() {
 }
 
 config_unset() {


@@ -74,8 +75,8 @@ config_clear() {
        local SECTION="$1"
        local oldvar
        
        local SECTION="$1"
        local oldvar
        

-       CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , ,")"
-       CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
+       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , ,")"
+       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"

 
        for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
                sed -e 's/\(.*\)=.*$/\1/'` ; do 
 
        for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
                sed -e 's/\(.*\)=.*$/\1/'` ; do 


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

-       local file="/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
        _C=0

-       CONFIG_SECTIONS=
-       CONFIG_NUM_SECTIONS=0
-       CONFIG_SECTION=
-       
-       [ -e "$file" ] && {
-               . $file
-       } || return 1
+       export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
+       export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
+       export ${NO_EXPORT:+-n} CONFIG_SECTION=
+
+       ${cfg:+. "$cfg"}
+       ${uci:+. "$uci"}

        
        ${CONFIG_SECTION:+config_cb}
 }
        
        ${CONFIG_SECTION:+config_cb}
 }


@@ -100,7 +118,18 @@ config_load() {
 config_get() {
        case "$3" in
                "") eval "echo \"\${CONFIG_${1}_${2}}\"";;
 config_get() {
        case "$3" in
                "") eval "echo \"\${CONFIG_${1}_${2}}\"";;

-               *)  eval "export -n -- \"$1=\${CONFIG_${2}_${3}}\"";;
+               *)  eval "export ${NO_EXPORT:+-n} -- \"$1=\${CONFIG_${2}_${3}}\"";;
+       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
 }
 
        esac
 }
 


@@ -108,22 +137,31 @@ config_set() {
        local section="$1"
        local option="$2"
        local value="$3"
        local section="$1"
        local option="$2"
        local value="$3"

-       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
+       local type="$2"
+       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

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

                eval "$function \"\$section\""
        done
 }
 
 load_modules() {
                eval "$function \"\$section\""
        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() {


@@ -136,9 +174,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>] ... }


@@ -155,13 +195,23 @@ strtok() { # <string> { <variable> [<separator>] ... }
 
                val="${val#$tmp$2}"
 
 
                val="${val#$tmp$2}"
 

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

                shift 2
        done
 
                shift 2
        done
 

-       if [ $# -gt 0 -a "$val" ]; then
-               export -n "$1=$val"; count=$((count+1))
+       if [ $# -gt 0 -a -n "$val" ]; then
+               export ${NO_EXPORT:+-n} "$1=$val"; count=$((count+1))

        fi
 
        return $count
 }
        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"
+}