From 17abb515dba4d733cced11bed637a13fe4bf4d3b Mon Sep 17 00:00:00 2001
From: yinle <yinle@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 15 Mar 2013 06:02:37 +0000
Subject: [PATCH] fix the issue that lsslp put in the SLP request messages into
 the "stana" files working with lsslp -z flag

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15522 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/lsslp.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/xCAT-server/lib/xcat/plugins/lsslp.pm b/xCAT-server/lib/xcat/plugins/lsslp.pm
index 2e33c60b4..3e084f6b2 100644
--- a/xCAT-server/lib/xcat/plugins/lsslp.pm
+++ b/xCAT-server/lib/xcat/plugins/lsslp.pm
@@ -550,6 +550,7 @@ sub invoke_dodiscover {
    $arg{Retry} = $maxt;
    $arg{Count} = $globalopt{C} if($globalopt{C});
    $arg{Time} = $globalopt{T} if($globalopt{T});
+   $arg{nomsg} = 1 if($globalopt{z} or $globalopt{x});
    $arg{reqcallback} = $request->{callback} if($request->{callback});
     my ($searchmacsref,$sendcount,$rsp) = xCAT::SLP::dodiscover(%arg);
 
@@ -1744,7 +1745,7 @@ sub process_request {
 	    $min = "more than 2";
     }	
     #my $start1 = Time::HiRes::gettimeofday();
-    send_msg( \%request, 0, "$sendcount requests with $rspc responses.  Now processing responses.  This will take $min minutes...");
+    send_msg( \%request, 0, "$sendcount requests with $rspc responses.  Now processing responses.  This will take $min minutes...") unless ($globalopt{x} or $globalopt{z});
     format_output( \%request, $searchmacsref);
     #my $elapsed1 = Time::HiRes::gettimeofday() - $start1;
     #send_msg( \%request, 0, "$num nodes takes $elapsed1");