Author: jow Date: 2015-11-30 11:43:18 +0100 (Mon, 30 Nov 2015) New Revision: 47673
Modified: trunk/package/base-files/files/lib/functions/uci-defaults-new.sh Log: 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 <[email protected]> Modified: trunk/package/base-files/files/lib/functions/uci-defaults-new.sh =================================================================== --- trunk/package/base-files/files/lib/functions/uci-defaults-new.sh 2015-11-30 10:17:20 UTC (rev 47672) +++ trunk/package/base-files/files/lib/functions/uci-defaults-new.sh 2015-11-30 10:43:18 UTC (rev 47673) @@ -60,7 +60,7 @@ 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 @@ 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 @@ 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 @@ local ports="$3" local cpu_port='' - case $vlan in + case "$vlan" in 1) vlan=lan;; 2) vlan=wan;; *) vlan=vlan$vlan;; _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
