diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-11-30 10:43:18 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-11-30 10:43:18 +0000 |
| commit | 86c0de3db894b609918a1fca4e6d7645045484fc (patch) | |
| tree | a248f2aabfda42dbb18830b75f4c114ebaab98c5 /package/base-files | |
| parent | 5ac13844a9581ff32fb4e2a7a9371cd6d5ea1a73 (diff) | |
| download | master-187ad058-86c0de3db894b609918a1fca4e6d7645045484fc.tar.gz master-187ad058-86c0de3db894b609918a1fca4e6d7645045484fc.tar.bz2 master-187ad058-86c0de3db894b609918a1fca4e6d7645045484fc.zip | |
base-files: uci-defaults-new: fix unquoted variables
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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47673 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files')
| -rwxr-xr-x | package/base-files/files/lib/functions/uci-defaults-new.sh | 10 |
1 files changed, 5 insertions, 5 deletions
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 3fe89838e4..613a418a1d 100755 --- a/package/base-files/files/lib/functions/uci-defaults-new.sh +++ b/package/base-files/files/lib/functions/uci-defaults-new.sh @@ -60,7 +60,7 @@ ucidef_set_interface_lan() { local lan_if="$1" json_select_object network - _ucidef_set_interface lan $lan_if + _ucidef_set_interface lan "$lan_if" json_select .. } @@ -68,7 +68,7 @@ ucidef_set_interface_wan() { local wan_if="$1" json_select_object network - _ucidef_set_interface wan $wan_if + _ucidef_set_interface wan "$wan_if" json_select .. } @@ -77,8 +77,8 @@ ucidef_set_interfaces_lan_wan() { local wan_if="$2" json_select_object network - _ucidef_set_interface lan $lan_if - _ucidef_set_interface wan $wan_if + _ucidef_set_interface lan "$lan_if" + _ucidef_set_interface wan "$wan_if" json_select .. } @@ -198,7 +198,7 @@ ucidef_add_switch_vlan() { local ports="$3" local cpu_port='' - case $vlan in + case "$vlan" in 1) vlan=lan;; 2) vlan=wan;; *) vlan=vlan$vlan;; |