X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/cdce6a14fb57a19714360c62b70c872150949489..65f7b3c0ed1b03fae80df82d4a2284c7a3570d8a:/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 dac46a349..af4eae23f 100755 --- 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 +LOAD_STATE=1 hotplug_dev() { env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net @@ -23,12 +24,21 @@ append() { eval "export ${NO_EXPORT:+-n} -- \"$var=\${$var:+\${$var}\${value:+\$sep}}\$value\"" } +config_load() { + [ -n "$IPKG_INSTROOT" ] && return 0 + uci_load "$@" +} + reset_cb() { config_cb() { return 0; } option_cb() { return 0; } } reset_cb +package() { + return 0 +} + config () { local cfgtype="$1" local name="$2" @@ -55,7 +65,7 @@ config_rename() { 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}_}" @@ -84,20 +94,6 @@ config_clear() { done } -config_load() { - local file="$UCI_ROOT/etc/config/$1" - _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}}\"";; @@ -110,9 +106,9 @@ 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}";; + 1|on|true|enabled) export ${NO_EXPORT:+-n} "$1=1";; + 0|off|false|disabled) export ${NO_EXPORT:+-n} "$1=0";; + *) eval "$1=$4";; esac } @@ -129,20 +125,24 @@ config_set() { 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 "$cfgtype" != "$type" ] && continue - eval "$function \"\$section\"" + [ -n "$type" -a "x$cfgtype" != "x$type" ] && continue + 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() { @@ -180,9 +180,32 @@ strtok() { # { [] ... } shift 2 done - if [ $# -gt 0 -a "$val" ]; then + 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 +)} + +[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh