projects
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
allow config_* and uci_* functions to work on files outside of /etc/config - these...
[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
1cb365d
..
7ba59af
100755
(executable)
--- 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() {
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() {
}
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"
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"
}
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"
local value="$*"
export ${NO_EXPORT:+-n} "CONFIG_${CONFIG_SECTION}_${varname}=$value"
- option_cb "$varname" "$*"
+
[ -n "$NO_CALLBACK" ] ||
option_cb "$varname" "$*"
}
config_rename() {
}
config_rename() {
@@
-85,7
+85,11
@@
config_clear() {
}
config_load() {
}
config_load() {
- local file="$UCI_ROOT/etc/config/$1"
+ 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
_C=0
export ${NO_EXPORT:+-n} CONFIG_SECTIONS=
export ${NO_EXPORT:+-n} CONFIG_NUM_SECTIONS=0
@@
-120,7
+124,11
@@
config_set() {
local section="$1"
local option="$2"
local value="$3"
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() {
}
config_foreach() {
@@
-137,8
+145,10
@@
config_foreach() {
}
load_modules() {
}
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() {
}
include() {
@@
-151,9
+161,11
@@
include() {
find_mtd_part() {
local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
find_mtd_part() {
local PART="$(grep "\"$1\"" /proc/mtd | awk -F: '{print $1}')"
+ local PREFIX=/dev/mtdblock
PART="${PART##mtd}"
PART="${PART##mtd}"
- echo "${PART:+/dev/mtdblock/$PART}"
+ [ -d /dev/mtdblock ] && PREFIX=/dev/mtdblock/
+ echo "${PART:+$PREFIX$PART}"
}
strtok() { # <string> { <variable> [<separator>] ... }
}
strtok() { # <string> { <variable> [<separator>] ... }
@@
-180,3
+192,13
@@
strtok() { # <string> { <variable> [<separator>] ... }
return $count
}
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"
+}
This page took
0.025251 seconds
and
4
git commands to generate.