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

SVN-Revision: 18717

package/base-files/files/etc/functions.sh

@@ -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

package/base-files/files/etc/init.d/boot

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