X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=package%2Fbase-files%2Ffiles%2Fetc%2Ffunctions.sh;h=284ed4c14fa79c8228ce69ef514d4b4e93beb10a;hb=4dcc9d335a6774282156f6f1cd6ee93876c55a9c;hp=931f4be472d01a799b690a917570d323f3488471;hpb=796420d4282fc8765dd6d0b0cc11507482ef5d35;p=openwrt-10.03%2F.git

diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh
index 931f4be47..284ed4c14 100755
--- a/package/base-files/files/etc/functions.sh
+++ b/package/base-files/files/etc/functions.sh
@@ -12,7 +12,7 @@ _C=0
 NO_EXPORT=1
 
 hotplug_dev() {
-	env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug net
+	env -i ACTION=$1 INTERFACE=$2 /sbin/hotplug-call net
 }
 
 append() {
@@ -36,7 +36,7 @@ config () {
 	export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=$(($CONFIG_NUM_SECTIONS + 1))
 	name="${name:-cfg$CONFIG_NUM_SECTIONS}"
 	append CONFIG_SECTIONS "$name"
-	config_cb "$cfgtype" "$name"
+	[ -n "$NO_CALLBACK" ] || config_cb "$cfgtype" "$name"
 	export ${NO_EXPORT:+-n} CONFIG_SECTION="$name"
 	export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_TYPE=$cfgtype"
 }
@@ -46,7 +46,7 @@ option () {
 	local value="$*"
 	
 	export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
-	option_cb "$varname" "$*"
+	[ -n "$NO_CALLBACK" ] || option_cb "$varname" "$*"
 }
 
 config_rename() {
@@ -55,7 +55,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}_}"
@@ -85,15 +85,32 @@ config_clear() {
 }
 
 config_load() {
-	local file="$UCI_ROOT/etc/config/$1"
+	local cfg
+	local uci
+	local PACKAGE="$1"
+
+	case "$PACKAGE" in
+		/*)	cfg="$PACKAGE"
+			uci=""
+		;;
+		*)	cfg="$UCI_ROOT/etc/config/$PACKAGE"
+			uci="/tmp/.uci/${PACKAGE}"
+		;;
+	esac
+
+	[ -e "$cfg" ] || cfg=""
+	[ -e "$uci" ] || uci=""
+
+	# no config
+	[ -z "$cfg" -a -z "$uci" ] && return 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
+
+	${cfg:+. "$cfg"}
+	${uci:+. "$uci"}
 	
 	${CONFIG_SECTION:+config_cb}
 }
@@ -110,8 +127,8 @@ 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";;
+		1|on|true|enabled) export ${NO_EXPORT:+-n} "$1=1";;
+		0|off|false|disabled) export ${NO_EXPORT:+-n} "$1=0";;
 		*) eval "$1=${4:-0}";;
 	esac
 }
@@ -120,22 +137,33 @@ config_set() {
 	local section="$1"
 	local option="$2"
 	local value="$3"
-	export ${NO_EXPORT:+-n} "CONFIG_${section}_${option}=$value"
+	local old_section="$CONFIG_SECTION"
+
+	CONFIG_SECTION="$section"
+	option "$option" "$value"
+	CONFIG_SECTION="$old_section"
 }
 
 config_foreach() {
 	local function="$1"
-	local section
+	[ "$#" -ge 1 ] && shift
+	local type="$1"
+	[ "$#" -ge 1 ] && shift
+	local section cfgtype
 	
 	[ -z "$CONFIG_SECTIONS" ] && return 0
 	for section in ${CONFIG_SECTIONS}; do
-		eval "$function \"\$section\""
+		config_get cfgtype "$section" TYPE
+		[ -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() {
@@ -148,9 +176,11 @@ include() {
 
 find_mtd_part() {
 	local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
+	local PREFIX=/dev/mtdblock
 	
 	PART="${PART##mtd}"
-	echo "${PART:+/dev/mtdblock/$PART}"
+	[ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
+	echo "${PART:+$PREFIX$PART}"
 }
 
 strtok() { # <string> { <variable> [<separator>] ... }
@@ -171,9 +201,19 @@ strtok() { # <string> { <variable> [<separator>] ... }
 		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"
+}