diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2009-12-09 15:15:25 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2009-12-09 15:15:25 +0000 |
| commit | bede0a2b458154077f37bbadc0e76acb9e7f0149 (patch) | |
| tree | 30990af542b6edffbe21b0cf0c42eeabdd0229ee /package/base-files/files/etc/functions.sh | |
| parent | 447645424981acbb46fe205e6720d495071f2a91 (diff) | |
| download | upstream-bede0a2b458154077f37bbadc0e76acb9e7f0149.tar.gz upstream-bede0a2b458154077f37bbadc0e76acb9e7f0149.tar.bz2 upstream-bede0a2b458154077f37bbadc0e76acb9e7f0149.zip | |
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
Diffstat (limited to 'package/base-files/files/etc/functions.sh')
| -rwxr-xr-x | package/base-files/files/etc/functions.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/etc/functions.sh b/package/base-files/files/etc/functions.sh index a788c4cc4e..61c04953d3 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 |