aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2015-11-30 10:43:18 +0000
committerJo-Philipp Wich <jow@openwrt.org>2015-11-30 10:43:18 +0000
commitb64f953cd8776d7bbcca085865f63c7ace473e48 (patch)
tree01cb75336c726617b903c67170729ddc329cc8b2
parent81f603dfb8b5e1d16c49ad5b1ba67455f9bcd472 (diff)
downloadupstream-b64f953cd8776d7bbcca085865f63c7ace473e48.tar.gz
upstream-b64f953cd8776d7bbcca085865f63c7ace473e48.tar.bz2
upstream-b64f953cd8776d7bbcca085865f63c7ace473e48.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> SVN-Revision: 47673
-rwxr-xr-xpackage/base-files/files/lib/functions/uci-defaults-new.sh10
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;;