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

Fix some mistakes.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@12539 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
yinle
2012-05-05 02:06:19 +00:00
parent e5bc9b43c7
commit e97573587a
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
perl-xCAT/xCAT/SLP.pm
View File

@@ -332,11 +332,22 @@ sub get_interfaces {
$_ =~ /UP(,|>)/ and
$_ =~ /BROADCAST/ ) {
my @ip = split /\n/;
foreach ( @ip ) {
if ( $_ =~ /^\s*inet\s+/ and
$_ =~ /broadcast\s+(\d+\.\d+\.\d+\.\d+)/ ) {
push @{$ifacemap{$nics[$i]}->{ipv4addrs}},$1;
for my$entry ( @ip ) {
if ( $entry =~ /broadcast\s+/ and $entry =~ /^\s*inet\s+(\d+\.\d+\.\d+\.\d+)/) {
my $tmpip = $1;
if($entry =~ /netmask\s+(0x\w+)/) {
my $mask = hex($1);
my $co = 31;
my $count = 0;
while ($co+1) {
if((($mask&(2**$co))>>$co) == 1) {
$count++;
}
$co--;
}
$tmpip = $tmpip.'/'.$count;
}
push @{$ifacemap{$nics[$i]}->{ipv4addrs}},$tmpip;
if( $nics[$i]=~ /\w+(\d+)/){
$ifacemap{$nics[$i]}->{scopeidx} = $1+2;
}
@@ -345,8 +356,8 @@ sub get_interfaces {
}
}
} else {
my @ipoutput = `ip addr`;
foreach my $line (@ipoutput) {
my @ipoutput = `ip addr`;
foreach my $line (@ipoutput) {
if ($line =~ /^\d/) { # new interface, new context..
if ($interface and not $keepcurrentiface) {
#don't bother reporting unusable nics