do not start multiple subshells for applying /etc/uci-defaults. use sh -x for hush compatibility

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18717 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Felix Fietkau 2009-12-09 15:15:25 +00:00
parent 4476454249
commit bede0a2b45
2 changed files with 5 additions and 6 deletions

View File

@ -263,7 +263,7 @@ jffs2_mark_erase() {
echo -e "\xde\xad\xc0\xde" | mtd -qq write - "$1"
}
uci_apply_defaults() {(
uci_apply_defaults() {
cd /etc/uci-defaults || return 0
files="$(ls)"
[ -z "$files" ] && return 0
@ -272,6 +272,6 @@ uci_apply_defaults() {(
( . "./$(basename $file)" ) && rm -f "$file"
done
uci commit
)}
}
[ -z "$IPKG_INSTROOT" -a -f /lib/config/uci.sh ] && . /lib/config/uci.sh

View File

@ -35,10 +35,9 @@ system_config() {
[ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel}
}
apply_uci_config() {(
include /lib/config
uci_apply_defaults
)}
apply_uci_config() {
sh -c '. /etc/functions.sh; include /lib/config; uci_apply_defaults'
}
start() {
[ -f /proc/mounts ] || /sbin/mount_root