Fix log messag on discover packet receipt

Also fix bmcsetup output to remove useless call

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@11492 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
jbjohnso 2012-02-06 22:28:07 +00:00
parent a7404f0c24
commit f2fad48d34
2 changed files with 1 additions and 7 deletions

View File

@ -280,12 +280,6 @@ if [ ! "$IPMIVER" == "1.5" ]; then
fi
while ! ipmitool -d $idev lan set $LANCHAN cipher_privs $PRIVS > /dev/null; do
sleep 1
let TRIES=TRIES+1
if [ $TRIES -gt $TIMEOUT ]; then break; fi
done
if [ $TRIES -gt $TIMEOUT ]; then echo "ERROR"; else echo "OK"; fi
TRIES=0
echo -n "Enabling SOL for channel $LANCHAN:"

View File

@ -520,7 +520,7 @@ sleep 0.05;
$req->{'_xcat_clientip'}=inet_ntoa($client);
$req->{'_xcat_clientport'}=$sport;
if (defined($cmd_handlers{"findme"}) and xCAT::Utils->nodeonmynet(inet_ntoa($client))) { #only discover from ips that appear to be on a managed network
xCAT::MsgUtils->message("S","xcatd: Processing discovery request from ".$req->{'_clientip'});
xCAT::MsgUtils->message("S","xcatd: Processing discovery request from ".$req->{'_xcat_clientip'});
$req->{cacheonly}->[0] = 1;
plugin_command($req,undef,\&build_response);
if ($req->{cacheonly}->[0]) {