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 018fe2c..0d4b2a3 100755 (executable)
--- a/package/base-files/files/lib/functions.sh
+++ b/package/base-files/files/lib/functions.sh
@@ -84,24 +84,6 @@ 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" ""
 }
@@ -120,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"
@@ -201,136 +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}"
-}
-
-mtd_get_mac_ascii()
-{
-       local mtdname="$1"
-       local key="$2"
-       local part
-       local mac_dirty
-
-       part=$(find_mtd_part "$mtdname")
-       if [ -z "$part" ]; then
-               echo "mtd_get_mac_ascii: partition $mtdname not found!" >&2
-               return
-       fi
-
-       mac_dirty=$(strings "$part" | sed -n 's/^'"$key"'=//p')
-
-       # "canonicalize" mac
-       [ -n "$mac_dirty" ] && macaddr_canonicalize "$mac_dirty"
-}
-
-mtd_get_blob()
-{
-       local mtdname="$1"
-       local offset="$2"
-       local count="$3"
-       local firmware="$4"
-       local part
-
-       part=$(find_mtd_part "$mtdname")
-       if [ -z "$part" ]; then
-               echo "mtd_get_blob: partition $mtdname not found!" >&2
-               return 1
-       fi
-
-       dd if=$part of=$firmware bs=1 skip=$offset count=$count 2>/dev/null || {
-               echo "mtd_get_blob: failed to extract $firmware from $part" >&2
-               return 1
-       }
-}
-
-mtd_get_mac_binary() {
-       local mtdname="$1"
-       local offset="$2"
-       local part
-
-       part=$(find_mtd_part "$mtdname")
-       if [ -z "$part" ]; then
-               echo "mtd_get_mac_binary: partition $mtdname not found!" >&2
-               return
-       fi
-
-       dd bs=1 skip=$offset count=6 if=$part 2>/dev/null | hexdump -v -n 6 -e '5/1 "%02x:" 1/1 "%02x"'
-}
-
-mtd_get_part_size() {
-       local part_name=$1
-       local first dev size erasesize name
-       while read dev size erasesize name; do
-               name=${name#'"'}; name=${name%'"'}
-               if [ "$name" = "$part_name" ]; then
-                       echo $((0x$size))
-                       break
-               fi
-       done < /proc/mtd
-}
-
-macaddr_add() {
-       local mac=$1
-       local val=$2
-       local oui=${mac%:*:*:*}
-       local nic=${mac#*:*:*:}
-
-       nic=$(printf "%06x" $((0x${nic//:/} + $val & 0xffffff)) | sed 's/^\(.\{2\}\)\(.\{2\}\)\(.\{2\}\)/\1:\2:\3/')
-       echo $oui:$nic
-}
-
-macaddr_setbit_la()
-{
-       local mac=$1
-
-       printf "%02x:%s" $((0x${mac%%:*} | 0x02)) ${mac#*:}
-}
-
-macaddr_2bin()
-{
-       local mac=$1
-
-       echo -ne \\x${mac//:/\\x}
-}
-
-macaddr_canonicalize()
-{
-       local mac="$1"
-       local canon=""
-
-       [ ${#mac} -gt 17 ] && return
-       [ -n "${mac//[a-fA-F0-9\.: -]/}" ] && return
-
-       for octet in ${mac//[\.:-]/ }; do
-               case "${#octet}" in
-               1)
-                       octet="0${octet}"
-                       ;;
-               2)
-                       ;;
-               4)
-                       octet="${octet:0:2} ${octet:2:2}"
-                       ;;
-               12)
-                       octet="${octet:0:2} ${octet:2:2} ${octet:4:2} ${octet:6:2} ${octet:8:2} ${octet:10:2}"
-                       ;;
-               *)
-                       return
-                       ;;
-               esac
-               canon=${canon}${canon:+ }${octet}
-       done
-
-       [ ${#canon} -ne 17 ] && return
-
-       printf "%02x:%02x:%02x:%02x:%02x:%02x" 0x${canon// / 0x} 2>/dev/null
-}
-
 group_add() {
        local name="$1"
        local gid="$2"