diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2014-04-07 10:01:54 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2014-04-07 10:01:54 +0000 |
| commit | 3d275a8debea2d31b40e17bc3ba93bf676802dbc (patch) | |
| tree | 581519aa736ac0124586d91f6955fc84f5d194cd | |
| parent | 4a6ad541d8c5fad305d6ed76bf37a4baf09110fa (diff) | |
| download | mtk-20170518-3d275a8debea2d31b40e17bc3ba93bf676802dbc.zip mtk-20170518-3d275a8debea2d31b40e17bc3ba93bf676802dbc.tar.gz mtk-20170518-3d275a8debea2d31b40e17bc3ba93bf676802dbc.tar.bz2 | |
base-files: move uci_apply_defaults() to /etc/init.d/boot
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 40408
| -rwxr-xr-x | package/base-files/files/etc/init.d/boot | 13 | ||||
| -rwxr-xr-x | package/base-files/files/lib/functions.sh | 11 |
2 files changed, 12 insertions, 12 deletions
diff --git a/package/base-files/files/etc/init.d/boot b/package/base-files/files/etc/init.d/boot index 45cb4a2..b44c1a6 100755 --- a/package/base-files/files/etc/init.d/boot +++ b/package/base-files/files/etc/init.d/boot @@ -4,6 +4,17 @@ START=10 STOP=98 +uci_apply_defaults() { + cd /etc/uci-defaults || return 0 + files="$(ls)" + [ -z "$files" ] && return 0 + mkdir -p /tmp/.uci + for file in $files; do + ( . "./$(basename $file)" ) && rm -f "$file" + done + uci commit +} + boot() { [ -f /proc/mounts ] || /sbin/mount_root [ -f /proc/jffs2_bbc ] && echo "S" > /proc/jffs2_bbc @@ -33,7 +44,7 @@ boot() { } rm -f /tmp/wireless.tmp - sh -c '. /lib/functions.sh; include /lib/config; uci_apply_defaults' + uci_apply_defaults # temporary hack until configd exists /sbin/reload_config diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index fa4c2d6..cec78c5 100755 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -368,17 +368,6 @@ jffs2_mark_erase() { echo -e "\xde\xad\xc0\xde" | mtd -qq write - "$1" } -uci_apply_defaults() { - cd /etc/uci-defaults || return 0 - files="$(ls)" - [ -z "$files" ] && return 0 - mkdir -p /tmp/.uci - for file in $files; do - ( . "./$(basename $file)" ) && rm -f "$file" - done - uci commit -} - group_add() { local name="$1" local gid="$2" |