From fd7accf225eb6dd24b51b8377169825c4dff8bc4 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Thu, 4 Jun 2009 19:12:04 +0000 Subject: [PATCH] -Remove confilicting hosts file entries git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3516 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/Table.pm | 4 ++++ xCAT-server/lib/xcat/plugins/hosts.pm | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/Table.pm b/perl-xCAT/xCAT/Table.pm index df257ce3f..c02ee66c5 100644 --- a/perl-xCAT/xCAT/Table.pm +++ b/perl-xCAT/xCAT/Table.pm @@ -8,6 +8,7 @@ package xCAT::Table; use Sys::Syslog; use Data::Dumper; +use IO::Socket::UNIX; BEGIN { $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : -d '/opt/xcat' ? '/opt/xcat' : '/usr'; @@ -25,6 +26,9 @@ require xCAT::NodeRange; use Text::Balanced qw(extract_bracketed); require xCAT::NotifHandler; +my $dbworkerpid; #The process id of the database worker +my $dbworkersocket; +my $dbsockpath; #-------------------------------------------------------------------------------- =head1 xCAT::Table diff --git a/xCAT-server/lib/xcat/plugins/hosts.pm b/xCAT-server/lib/xcat/plugins/hosts.pm index 5981ab255..3898f63bc 100644 --- a/xCAT-server/lib/xcat/plugins/hosts.pm +++ b/xCAT-server/lib/xcat/plugins/hosts.pm @@ -33,7 +33,6 @@ sub addnode { while ($idx <= $#hosts) { if ($hosts[$idx] =~ /^${ip}\s/ or $hosts[$idx] =~ /^\d+\.\d+\.\d+\.\d+\s+${node}[\s\.r/) { - #TODO: if foundone, delete a dupe if ($foundone) { $hosts[$idx]=""; } else {