make opkg the default package manager, disable busybox ipkg from building by default

[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 8d11171..0314692 100755 (executable)
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -10,6 +10,7 @@ N="
 
 _C=0
 NO_EXPORT=1
 
 _C=0
 NO_EXPORT=1

+LOAD_STATE=1

 
 hotplug_dev() {
        env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
 
 hotplug_dev() {
        env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net


@@ -23,12 +24,45 @@ append() {
        eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
 }
 
        eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\""
 }
 

+list_contains() {
+       local var="$1"
+       local str="$2"
+       local val
+
+       eval "val=\" \${$var} \""
+       [ "${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 "$@"
+}
+

 reset_cb() {
        config_cb() { return 0; }
        option_cb() { return 0; }
 }
 reset_cb
 
 reset_cb() {
        config_cb() { return 0; }
        option_cb() { return 0; }
 }
 reset_cb
 

+package() {
+       return 0
+}
+

 config () {
        local cfgtype="$1"
        local name="$2"
 config () {
        local cfgtype="$1"
        local name="$2"


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

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

        export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
 
        for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \
        export ${NO_EXPORT:+-n} CONFIG_SECTIONS="${SECTION:+$CONFIG_SECTIONS}"
 
        for oldvar in `set | grep ^CONFIG_${SECTION:+${SECTION}_} | \


@@ -84,24 +118,6 @@ config_clear() {
        done
 }
 
        done
 }
 

-config_load() {
-       local file
-       case "$1" in
-               /*) file="$1";;
-               *) file="$UCI_ROOT/etc/config/$1";;
-       esac
-       _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
-       
-       ${CONFIG_SECTION:+config_cb}
-}
-

 config_get() {
        case "$3" in
                "") eval "echo \"\${CONFIG_${1}_${2}}\"";;
 config_get() {
        case "$3" in
                "") eval "echo \"\${CONFIG_${1}_${2}}\"";;


@@ -114,9 +130,9 @@ config_get_bool() {
        local _tmp
        config_get "_tmp" "$2" "$3"
        case "$_tmp" in
        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}";;
+               1|on|true|enabled) export ${NO_EXPORT:+-n} "$1=1";;
+               0|off|false|disabled) export ${NO_EXPORT:+-n} "$1=0";;
+               *) eval "$1=$4";;

        esac
 }
 
        esac
 }
 


@@ -133,14 +149,16 @@ config_set() {
 
 config_foreach() {
        local function="$1"
 
 config_foreach() {
        local function="$1"

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

        local section cfgtype
        
        [ -z "$CONFIG_SECTIONS" ] && return 0
        for section in ${CONFIG_SECTIONS}; do
                config_get cfgtype "$section" TYPE
                [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue
        local section cfgtype
        
        [ -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\""
+               eval "$function \"\$section\" \"\$@\""

        done
 }
 
        done
 }
 


@@ -202,3 +220,16 @@ jffs2_mark_erase() {
        }
        echo -e "\xde\xad\xc0\xde" | mtd -qq write - "$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
+)}
+
+[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh