diff options
| author | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-11 03:32:21 -0700 |
|---|---|---|
| committer | Erik Fonnesbeck <efonnes@gmail.com> | 2010-02-12 23:45:57 -0700 |
| commit | 298d6b080d1319d9eb0189c843c0977577a94c94 (patch) | |
| tree | e87326a3b520319d6978fb9032663b01990f980d /etc/inc | |
| parent | 5636c533fe9e5e4502ab75f2d51bca94830db18a (diff) | |
| download | pfsense-298d6b080d1319d9eb0189c843c0977577a94c94.zip pfsense-298d6b080d1319d9eb0189c843c0977577a94c94.tar.gz | |
For now, don't count any wireless clones as mismatches unless the base interface doesn't exist.
Diffstat (limited to 'etc/inc')
| -rw-r--r-- | etc/inc/util.inc | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 2ad1ddd..14c54db 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -961,10 +961,16 @@ function is_interface_mismatch() { if (preg_match("/^enc|^tun|^ppp|^pptp|^pppoe|^ovpn|^gif|^gre|^lagg|^bridge|vlan/i", $ifcfg['if'])) { $i++; } - else if (does_interface_exist($ifcfg['if']) == false) { - $do_assign = true; - } else - $i++; + else { + $baseif = $ifcfg['if']; + if(stristr($baseif, "_wlan")) { + $baseif = substr($baseif, 0, stripos($baseif, "_wlan")); + } + if (does_interface_exist($ifcfg['if']) == false) { + $do_assign = true; + } else + $i++; + } } if ($g['minimum_nic_count'] > $i) { |
