2
0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-06-03 03:50:08 +00:00

Merge pull request #2378 from bybai/makedns_3

makedns add redundant message in /etc/named.conf 2377
This commit is contained in:
Victor Hu 2017-01-09 10:00:31 -05:00 committed by GitHub
commit 646f4648a9

View File

@ -1222,7 +1222,7 @@ sub update_namedconf {
push @newnamed, $line;
}
}
} else {
} elsif ($line !~ /generated by xCAT/) {
push @newnamed, $line;
}
}
@ -1370,7 +1370,9 @@ sub update_namedconf {
flock($newnameconf, LOCK_EX);
seek($newnameconf, 0, 0);
truncate($newnameconf, 0);
print $newnameconf "\#generated by xCAT: /opt/xcat/sbin/makedns -n \n";
if ($newnameconf !~ /generated by xCAT/) {
print $newnameconf "\#generated by xCAT: /opt/xcat/sbin/makedns command \n";
}
for my $l (@newnamed) { print $newnameconf $l; }
flock($newnameconf, LOCK_UN);
close($newnameconf);