KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
SVN-Revision: 18717
This commit is contained in:
Felix Fietkau 2009-12-09 15:15:25 +00:00
parent 74cbcc9ee5
commit 889532d1fd
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/base-files/files/etc/functions.sh
View file

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

7
package/base-files/files/etc/init.d/boot
View file

@ -35,10 +35,9 @@ system_config() {
[ -x /sbin/klogd ] && klogd ${klogconloglevel:+-c $klogconloglevel} [ -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() { start() {
[ -f /proc/mounts ] || /sbin/mount_root [ -f /proc/mounts ] || /sbin/mount_root