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

fixed the lsslp issue that it is possible to append -1,-2 to the existing hostname in /etc/hosts

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4563 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
wanghuaz
2009-11-13 12:56:37 +00:00
parent e4033f21f0
commit a8013ef8ef
2 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
perl-xCAT/xCAT/Utils.pm
View File

@@ -5324,7 +5324,8 @@ sub get_unique_members
##########################################################################
sub updateEtcHosts
{
my $host_ip = shift;
my $host = shift;
my $ip = shift;
my $fname = "/etc/hosts";
unless ( open( HOSTS,"<$fname" )) {
return undef;
@@ -5337,32 +5338,22 @@ sub updateEtcHosts
######################################
# Remove old entry
######################################
foreach my $host ( keys %$host_ip) {
my $ip = $host_ip->{ $host};
my $updated = 0;
foreach my $line ( @rawdata ) {
if ( $line =~ /^#/ or $line =~ /^\s*$/ ) {
next;
}
if ( $line =~ /^\s*\Q$ip\E\s+/ )
{
if ( $line =~ /\s+\Q$host\E\s+/ or
$line =~ /\s+\Q$host\E$/)
{
}
else
{
$line .= "\t$host";
}
$updated = 1;
last;
}
my $updated = 0;
foreach my $line ( @rawdata ) {
if ( $line =~ /^#/ or $line =~ /^\s*$/ ) {
next;
}
if ( !$updated)
if ( $line =~ /^\s*\Q$ip\E\s+(.*)$/ )
{
push @rawdata, "$ip\t$host";
$host = $1;
$updated = 1;
last;
}
}
if ( !$updated)
{
push @rawdata, "$ip\t$host";
}
######################################
# Rewrite file
######################################
@@ -5374,6 +5365,7 @@ sub updateEtcHosts
print HOSTS "$line\n";
}
close( HOSTS );
return 1;
return [$host,$ip];
}
1;

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

@@ -1021,6 +1021,7 @@ sub format_output {
if ( exists( $opt{w} )) {
xCATdB( $outhash );
}
###########################################
# -r flag for raw response format
###########################################
@@ -1146,6 +1147,23 @@ sub gethost_from_url {
}
}
}
###############################################################
# Convert IP to hostname (Accoording to DNS or /etc/hosts
###############################################################
my $host = gethostbyaddr( $packed, AF_INET );
if ( !$host or $! ) {
#Tentative solution
return undef if ($opt{H});
}
if ( $host ) {
if ( $::VPD_TAB_CACHE{$host} ) {
delete $::VPD_TAB_CACHE{$host};
}
return( "$host($ip)" );
}
if ( $rsp =~ /\(machinetype-model=(.*?)\)/ )
{
my $mtm = $1;
@@ -1154,6 +1172,12 @@ sub gethost_from_url {
my $sn = $1;
foreach my $node ( keys %::VPD_TAB_CACHE ) {
if ( $::VPD_TAB_CACHE{$node} eq $mtm . '*' . $sn ) {
my $iip = gethostbyname($node);
if ( !$iip ) {
delete $::VPD_TAB_CACHE{$node};
return $node . "($ip)";
}
delete $::VPD_TAB_CACHE{$node};
return $node . "($ip)";
@@ -1183,16 +1207,7 @@ sub gethost_from_url {
return $::HOST_TAB_CACHE{ $ip} ."($ip)";
}
###############################################################
# Convert IP to hostname (Accoording to DNS or /etc/hosts
###############################################################
my $host = gethostbyaddr( $packed, AF_INET );
if ( !$host or $! ) {
#Tentative solution
return undef if ($opt{H});
$host = getFactoryHostname($type,$mtm,$sn,$rsp);
#return( $ip );
}
$host = getFactoryHostname($type,$mtm,$sn,$rsp);
#######################################
# Convert hostname to short-hostname
#######################################
@@ -1595,11 +1610,16 @@ sub xCATdB {
$host_ip{$name} = $ips;
}
$ips = @$data[3] if ( !$ips);
$name = @$data[4] if ( !$name);
my $hostip = xCAT::Utils::updateEtcHosts($name,$ips);
$name = @$hostip[0];
$ips = @$hostip[1];
if ( $type =~ /^BPA$/ ) {
my $model = @$data[1];
my $serial = @$data[2];
$ips = @$data[3] if ( !$ips);
$name = @$data[4] if ( !$name);
my $id = @$data[6];
####################################
@@ -1698,7 +1718,7 @@ sub xCATdB {
xCAT::PPCdb::add_systemX( $type, $data );
}
}
xCAT::Utils::updateEtcHosts(\%host_ip);
# xCAT::Utils::updateEtcHosts(\%host_ip);
}