From: blogic Date: Thu, 8 Jan 2015 20:26:52 +0000 (+0000) Subject: base-files: Fix switch settings for uci-defaults-new.sh. X-Git-Url: https://git.archive.openwrt.org/?a=commitdiff_plain;h=89821af9eee0de47e640df9bddc2c6fc95604fdf;p=openwrt.git base-files: Fix switch settings for uci-defaults-new.sh. The enable and reset settings need to be added even when they're false. This is true at least for 'enable', that seems to default to true otherwise. Signed-off-by: Vittorio Gambaletta git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43887 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- diff --git a/package/base-files/files/lib/functions/uci-defaults-new.sh b/package/base-files/files/lib/functions/uci-defaults-new.sh index 0751744dcb..7222ff839c 100755 --- a/package/base-files/files/lib/functions/uci-defaults-new.sh +++ b/package/base-files/files/lib/functions/uci-defaults-new.sh @@ -70,8 +70,8 @@ ucidef_add_switch() { json_select_object switch json_select_object $name - [ "$enable" -eq 1 ] && json_add_boolean enable 1 - [ "$reset" -eq 1 ] && json_add_boolean reset 1 + json_add_boolean enable $enable + json_add_boolean reset $reset json_select .. json_select ..