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

Fixed bug 2987151: makedhcp have one issue with a clean DHCP configuration file on AIX

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@5774 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz 2010-04-15 06:56:26 +00:00
parent 8b64d9795c
commit 53031e65db
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -705,6 +705,21 @@ sub process_request
}
}
foreach (@nrn)
{
my @line = split /:/;
my $firstoctet = $line[0];
$firstoctet =~ s/^(\d+)\..*/$1/;
if ($line[0] eq "169.254.0.0" or ($firstoctet >= 224 and $firstoctet <= 239))
{
next;
}
if ($activenics{$line[1]} and $line[3] !~ /G/)
{
addnet($line[0], $line[2]);
}
}
if ($req->{node})
{
my $ip_hash;
@ -783,20 +798,6 @@ sub process_request
}
close($omshell) if ($^O ne 'aix');
}
foreach (@nrn)
{
my @line = split /:/;
my $firstoctet = $line[0];
$firstoctet =~ s/^(\d+)\..*/$1/;
if ($line[0] eq "169.254.0.0" or ($firstoctet >= 224 and $firstoctet <= 239))
{
next;
}
if ($activenics{$line[1]} and $line[3] !~ /G/)
{
addnet($line[0], $line[2]);
}
}
writeout();
if ($restartdhcp) {
if ( $^O eq 'aix')

2
xCAT-server/lib/xcat/plugins/lsslp.pm
View File

@ -1906,7 +1906,7 @@ sub do_makedhcp {
$string = "Add following nodes to dhcp server: \n$node\n";
send_msg( $request, 0, $string );
`makedhcp -n $node`;
`makedhcp $node`;
send_msg( $request, 0, "\nMakedhcp finished.\n" );