arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix for bug 3902: add bridge nics into dhcpd.conf, em\d+ for Fedora

Browse Source
This commit is contained in:
ligc 2013-12-05 12:51:49 +08:00
parent c78350a9bf
commit 1170cda7f4
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xCAT-server/lib/xcat/plugins/dhcp.pm
View File

@ -1374,7 +1374,18 @@ sub process_request
{
next;
}
if ($ent[1] =~ m/(remote|ipoib|ib|vlan|bond|eth|myri|man|wlan|en\d+)/)
# Bridge nics
if ((-f "/usr/sbin/brctl") || (-f "/sbin/brctl"))
{
system "brctl showmacs $ent[1] 2>&1 1>/dev/null";
if ($? == 0)
{
$activenics{$ent[1]} = 1;
next;
}
}
if ($ent[1] =~ m/(remote|ipoib|ib|vlan|bond|eth|myri|man|wlan|en\d+|em\d+)/)
{ #Mask out many types of interfaces, like xCAT 1.x
$activenics{$ent[1]} = 1;
}