From 889532d1fd7d2fe969f5ae454e38bf8f1e59bd95 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 9 Dec 2009 15:15:25 +0000 Subject: 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '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 a788c4c..61c0495 100755 --- a/package/base-files/files/etc/functions.sh +++ b/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 -- cgit v1.1