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>
SVN-Revision: 47673

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 3fe89838e4d42cba6ca45a5bd18c977db2867c58..613a418a1de966c721b1a053fab4f228ac348389 100755 (executable)
--- 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;;