domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

base-files: uci-defaults-new: fix unquoted variables

Browse Source 
Properly quote variables in ucidef_set_interface_lan() and
ucidef_set_interface_lan(), otherwise interfaces with multiple devices
are not properly written into the configuration.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 47673
This commit is contained in:
Jo-Philipp Wich
2015-11-30 10:43:18 +00:00
parent 81f603dfb8
commit b64f953cd8
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
package/base-files/files/lib/functions/uci-defaults-new.sh
View File

@@ -60,7 +60,7 @@ ucidef_set_interface_lan() {
local lan_if="$1" local lan_if="$1"
json_select_object network json_select_object network
_ucidef_set_interface lan $lan_if _ucidef_set_interface lan "$lan_if"
json_select .. json_select ..
} }
@@ -68,7 +68,7 @@ ucidef_set_interface_wan() {
local wan_if="$1" local wan_if="$1"
json_select_object network json_select_object network
_ucidef_set_interface wan $wan_if _ucidef_set_interface wan "$wan_if"
json_select .. json_select ..
} }
@@ -77,8 +77,8 @@ ucidef_set_interfaces_lan_wan() {
local wan_if="$2" local wan_if="$2"
json_select_object network json_select_object network
_ucidef_set_interface lan $lan_if _ucidef_set_interface lan "$lan_if"
_ucidef_set_interface wan $wan_if _ucidef_set_interface wan "$wan_if"
json_select .. json_select ..
} }
@@ -198,7 +198,7 @@ ucidef_add_switch_vlan() {
local ports="$3" local ports="$3"
local cpu_port='' local cpu_port=''
case $vlan in case "$vlan" in
1) vlan=lan;; 1) vlan=lan;;
2) vlan=wan;; 2) vlan=wan;;
*) vlan=vlan$vlan;; *) vlan=vlan$vlan;;