base-files: define yes/no as valid boolean options

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

diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh
index db59706..0d4b2a3 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
-# Copyright (C) 2006-2011 OpenWrt.org
+# Copyright (C) 2006-2013 OpenWrt.org
 # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de>
+# Copyright (C) 2010 Vertical Communications
 
 
 debug () {
@@ -16,10 +17,6 @@ NO_EXPORT=1
 LOAD_STATE=1
 LIST_SEP=" "
 
-hotplug_dev() {
-       env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
-}
-
 append() {
        local var="$1"
        local value="$2"
@@ -37,21 +34,6 @@ list_contains() {
        [ "${val%% $str *}" != "$val" ]
 }
 
-list_remove() {
-       local var="$1"
-       local remove="$2"
-       local val
-
-       eval "val=\" \${$var} \""
-       val1="${val%% $remove *}"
-       [ "$val1" = "$val" ] && return
-       val2="${val##* $remove }"
-       [ "$val2" = "$val" ] && return
-       val="${val1## } ${val2%% }"
-       val="${val%% }"
-       eval "export ${NO_EXPORT:+-n} -- \"$var=\$val\""
-}
-
 config_load() {
        [ -n "$IPKG_INSTROOT" ] && return 0
        uci_load "$@"
@@ -102,41 +84,10 @@ list() {
        list_cb "$varname" "$*"
 }
 
-config_rename() {
-       local OLD="$1"
-       local NEW="$2"
-       local oldvar
-       local newvar
-
-       [ -n "$OLD" -a -n "$NEW" ] || return
-       for oldvar in `set | grep ^CONFIG_${OLD}_ | \
-               sed -e 's/\(.*\)=.*$/\1/'` ; do
-               newvar="CONFIG_${NEW}_${oldvar##CONFIG_${OLD}_}"
-               eval "export ${NO_EXPORT:+-n} \"$newvar=\${$oldvar}\""
-               unset "$oldvar"
-       done
-       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="$(echo " $CONFIG_SECTIONS " | sed -e "s, $OLD , $NEW ,")"
-
-       [ "$CONFIG_SECTION" = "$OLD" ] && export ${NO_EXPORT:+-n} CONFIG_SECTION="$NEW"
-}
-
 config_unset() {
        config_set "$1" "$2" ""
 }
 
-config_clear() {
-       local SECTION="$1"
-       local oldvar
-
-       list_remove CONFIG_SECTIONS "$SECTION"
-       export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
-
-       for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
-               sed -e 's/\(.*\)=.*$/\1/'` ; do
-               unset $oldvar
-       done
-}
-
 # config_get <variable> <section> <option> [<default>]
 # config_get <section> <option>
 config_get() {
@@ -151,8 +102,8 @@ config_get_bool() {
        local _tmp
        config_get _tmp "$2" "$3" "$4"
        case "$_tmp" in
-               1|on|true|enabled) _tmp=1;;
-               0|off|false|disabled) _tmp=0;;
+               1|on|true|yes|enabled) _tmp=1;;
+               0|off|false|no|disabled) _tmp=0;;
                *) _tmp="$4";;
        esac
        export ${NO_EXPORT:+-n} "$1=$_tmp"
@@ -197,12 +148,12 @@ config_list_foreach() {
        [ -z "$len" ] && return 0
        while [ $c -le "$len" ]; do
                config_get val "${section}" "${option}_ITEM$c"
-               eval "$function \"\$val\" \"$@\""
+               eval "$function \"\$val\" \"\$@\""
                c="$(($c + 1))"
        done
 }
 
-load_modules() {
+insert_modules() {
        [ -d /etc/modules.d ] && {
                cd /etc/modules.d
                sed 's/^[^#]/insmod &/' $* | ash 2>&- || :
@@ -232,60 +183,6 @@ find_mtd_part() {
        echo "${INDEX:+$PREFIX$INDEX}"
 }
 
-find_mtd_chardev() {
-       local INDEX=$(find_mtd_index "$1")
-       local PREFIX=/dev/mtd
-
-       [ -d /dev/mtd ] && PREFIX=/dev/mtd/
-       echo "${INDEX:+$PREFIX$INDEX}"
-}
-
-strtok() { # <string> { <variable> [<separator>] ... }
-       local tmp
-       local val="$1"
-       local count=0
-
-       shift
-
-       while [ $# -gt 1 ]; do
-               tmp="${val%%$2*}"
-
-               [ "$tmp" = "$val" ] && break
-
-               val="${val#$tmp$2}"
-
-               export ${NO_EXPORT:+-n} "$1=$tmp"; count=$((count+1))
-               shift 2
-       done
-
-       if [ $# -gt 0 -a -n "$val" ]; then
-               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"
-}
-
-uci_apply_defaults() {
-       cd /etc/uci-defaults || return 0
-       files="$(ls)"
-       [ -z "$files" ] && return 0
-       mkdir -p /tmp/.uci
-       for file in $files; do
-               ( . "./$(basename $file)" ) && rm -f "$file"
-       done
-       uci commit
-}
-
 group_add() {
        local name="$1"
        local gid="$2"
@@ -323,29 +220,4 @@ user_exists() {
        grep -qs "^${1}:" ${IPKG_INSTROOT}/etc/passwd
 }
 
-
-pi_include() {
-       if [ -f "/tmp/overlay/$1" ]; then
-               . "/tmp/overlay/$1"
-       elif [ -f "$1" ]; then
-               . "$1"
-       elif [ -d "/tmp/overlay/$1" ]; then
-               if [ -n "$(ls /tmp/overlay/$1/*.sh 2>/dev/null)" ]; then
-                       for src_script in /tmp/overlay/$1/*.sh; do
-                               . "$src_script"
-                       done
-               fi
-       elif [ -d "$1" ]; then
-               if [ -n "$(ls $1/*.sh 2>/dev/null)" ]; then
-                       for src_script in $1/*.sh; do
-                               . "$src_script"
-                       done
-               fi
-       else
-               echo "WARNING: $1 not found"
-               return 1
-       fi
-       return 0
-}
-
 [ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh