reset CONFIG_SECTION when calling config_load

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

diff --git a/package/base-files/default/etc/functions.sh b/package/base-files/default/etc/functions.sh
index e87515d..f7cb878 100755 (executable)
--- a/package/base-files/default/etc/functions.sh
+++ b/package/base-files/default/etc/functions.sh
@@ -1,4 +1,7 @@
 #!/bin/sh
+# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
+
 alias debug=${DEBUG:-:}
 
 # newline
@@ -7,13 +10,6 @@ N="
 
 _C=0
 
-# valid interface?
-if_valid () (
-  ifconfig "$1" >&- 2>&- ||
-  [ "${1%%[0-9]}" = "br" ] ||
-  { debug "# missing interface '$1' ignored"; false; }
-)
-
 hotplug_dev() {
        env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
 }
@@ -22,7 +18,7 @@ append() {
        local var="$1"
        local value="$2"
        local sep="${3:- }"
-       eval "export ${var}=\"\${${var}:+\${${var}}${value:+$sep}}$value\""
+       eval "export ${var}=\"\${${var}:+\${${var}}${value:+$sep}}\$value\""
 }
 
 reset_cb() {
@@ -36,21 +32,41 @@ reset_cb() {
 reset_cb
 
 config () {
-       local type="$1"
-       local name="$2"
-       _C=$(($_C + 1))
-       name="${name:-cfg${_C}}"
-       config_cb "$type" "$name"
-       export CONFIG_SECTION="$name"
-       export CONFIG_${CONFIG_SECTION}_TYPE="$type"
+    local cfgtype="$1"
+    local name="$2"
+    _C=$(($_C + 1))
+    name="${name:-cfg${_C}}"
+    config_cb "$cfgtype" "$name"
+    export CONFIG_SECTION="$name"
+    export CONFIG_${CONFIG_SECTION}_TYPE="$cfgtype"
 }
 
 option () {
-       local varname="$1" ; shift
+       local varname="$1"; shift
        export CONFIG_${CONFIG_SECTION}_${varname}="$*"
        option_cb "$varname" "$*"
 }
 
+config_rename() {
+       local OLD="$1"
+       local NEW="$2"
+       local oldsetting
+       local newvar
+       
+       [ -z "$OLD" -o -z "$NEW" ] && return
+       for oldsetting in `set | grep ^CONFIG_${OLD}_ | \
+               sed -e 's/\(.*\)=.*$/\1/'` ; do
+               newvar="CONFIG_${NEW}_${oldsetting##CONFIG_${OLD}_}"
+               eval "${newvar}=\${$oldsetting}"
+               unset "$oldsetting"
+       done
+       [ "$CONFIG_SECTION" = "$OLD" ] && CONFIG_SECTION="$NEW"
+}
+
+config_unset() {
+       config_set "$1" "$2" ""
+}
+
 config_clear() {
        [ -z "$CONFIG_SECTION" ] && return
        for oldsetting in `set | grep ^CONFIG_${CONFIG_SECTION}_ | \
@@ -61,6 +77,7 @@ config_clear() {
 }
 
 config_load() {
+       CONFIG_SECTION=
        local DIR="./"
        _C=0
        [ \! -e "$1" -a -e "/etc/config/$1" ] && {
@@ -76,7 +93,7 @@ config_load() {
 
 config_get() {
        case "$3" in
-               "") eval "echo \${CONFIG_${1}_${2}}";;
+               "") eval "echo \"\${CONFIG_${1}_${2}}\"";;
                *) eval "$1=\"\${CONFIG_${2}_${3}}\"";;
        esac
 }
@@ -88,3 +105,16 @@ config_set() {
 load_modules() {
        sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
 }
+
+include() {
+       for file in $(ls $1/*.sh 2>/dev/null); do
+               . $file
+       done
+}
+
+find_mtd_part() {
+       local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
+       PART="${PART##mtd}"
+       echo "${PART:+/dev/mtdblock/$PART}"
+}
+