-Prevent empty subnet declarations

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8727 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2011-01-21 23:34:11 +00:00
parent efb11951b4
commit 47d86fe4b6

View File

@ -1720,9 +1720,19 @@ sub writeout
{
my $targ;
open($targ, '>', $dhcpconffile);
foreach (@dhcpconf)
my $idx;
my $skipone;
foreach $idx (0..$#dhcpconf)
{
print $targ $_;
#avoid writing out empty shared network declarations
if ($dhcpconf[$idx] =~ /^shared-network/ and $dhcpconf[$idx+1] =~ /^} .* nic_end/) {
$skipone=1;
next;
} elsif ($skipone) {
$skipone=0;
next;
}
print $targ $dhcpconf[$idx];
}
close($targ);
if (@dhcp6conf) {