Match also ifname with multiple digit number like eth11

libremesh · Nov 9, 2014 · 9fd15dc · 9fd15dc
1 parent 83e5a2d
commit 9fd15dc
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/packages/lime-proto-batadv/src/batadv.lua b/packages/lime-proto-batadv/src/batadv.lua
@@ -8,7 +8,7 @@ local utils = require("lime.utils")
 batadv = {}
 
 function batadv.setup_interface(ifname, args)
-	if ifname:match("^wlan%d_ap") then return end
+	if ifname:match("^wlan%d+_ap") then return end
 	local vlanId = args[2] or "%N1"
 	local vlanProto = args[3] or "8021ad"
 	local nameSuffix = args[4] or "_batadv"

diff --git a/packages/lime-proto-bmx6/src/bmx6.lua b/packages/lime-proto-bmx6/src/bmx6.lua
@@ -9,7 +9,7 @@ local wireless = require("lime.wireless")
 bmx6 = {}
 
 function bmx6.setup_interface(ifname, args)
-	if ifname:match("^wlan%d_ap") then return end
+	if ifname:match("^wlan%d+_ap") then return end
 	vlanId = args[2] or 13
 	vlanProto = args[3] or "8021ad"
 	nameSuffix = args[4] or "_bmx6"

diff --git a/packages/lime-proto-eigennet/src/eigennet.lua b/packages/lime-proto-eigennet/src/eigennet.lua
@@ -7,9 +7,9 @@ local libuci = require("uci")
 eigennet = {}
 
 function eigennet.setup_interface(ifname, args)
-	if ifname:match("^wlan%d_ap") then return end
+	if ifname:match("^wlan%d+_ap") then return end
 
-	if ifname:match("^eth%d$") then
+	if ifname:match("^eth%d+$") then
 		args[2] = args[2] or 10
 		args[3] = args[3] or "8021q"
 		args[4] = args[4] or "_eigennet"
@@ -18,7 +18,7 @@ function eigennet.setup_interface(ifname, args)
 		return
 	end
 
-	if ifname:match("^wlan%d_adhoc$") then
+	if ifname:match("^wlan%d+_adhoc$") then
 		local owrtInterfaceName = network.limeIfNamePrefix..ifname
 
 		local uci = libuci:cursor()

diff --git a/packages/lime-system/files/usr/lib/lua/lime/proto/adhoc.lua b/packages/lime-system/files/usr/lib/lua/lime/proto/adhoc.lua
@@ -7,7 +7,7 @@ local adhoc = {}
 function adhoc.configure(args) end
 
 function adhoc.setup_interface(ifname, args)
-	if ifname:match("^wlan%d_"..adhoc_mode.wifi_mode) then
+	if ifname:match("^wlan%d+_"..adhoc_mode.wifi_mode) then
 		local libuci = require "uci"
 		local uci = libuci:cursor()
 

diff --git a/packages/lime-system/files/usr/lib/lua/lime/proto/ieee80211s.lua b/packages/lime-system/files/usr/lib/lua/lime/proto/ieee80211s.lua
@@ -7,7 +7,7 @@ local ieee80211s = {}
 function ieee80211s.configure(args) end
 
 function ieee80211s.setup_interface(ifname, args)
-	if ifname:match("^wlan%d_"..ieee80211s_mode.wifi_mode) then
+	if ifname:match("^wlan%d+_"..ieee80211s_mode.wifi_mode) then
 		local libuci = require "uci"
 		local uci = libuci:cursor()