From bc951b2525084d8007b0e028b25cf2991da0124d Mon Sep 17 00:00:00 2001
From: jbjohnso <jbjohnso@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 2 May 2008 12:53:09 +0000
Subject: [PATCH] -Fix improper lack of 'serverdone' tag -Fix syntax error in
 conserver plugin

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

diff --git a/xCAT-server-2.0/lib/xcat/plugins/conserver.pm b/xCAT-server-2.0/lib/xcat/plugins/conserver.pm
index 88f3d06bd..ae1e18a79 100644
--- a/xCAT-server-2.0/lib/xcat/plugins/conserver.pm
+++ b/xCAT-server-2.0/lib/xcat/plugins/conserver.pm
@@ -218,7 +218,7 @@ sub makeconservercf {
   # skip the one that does not have 'cons' defined, unless a serialport setting suggests otherwise
   my @cfgents=();
   foreach (@cfgents1) { 
-    if ($_->{cons} or defined($_->{'serialport'}) { push @cfgents, $_; } 
+    if ($_->{cons} or defined($_->{'serialport'})) { push @cfgents, $_; } 
   }
   
   # get the teminal servers and terminal port when cons is mrv or cyclades
diff --git a/xCAT-server-2.0/sbin/xcatd b/xCAT-server-2.0/sbin/xcatd
index 3b719a530..1d1675d6f 100755
--- a/xCAT-server-2.0/sbin/xcatd
+++ b/xCAT-server-2.0/sbin/xcatd
@@ -556,6 +556,7 @@ sub plugin_command {
     @nodes = noderange($req->{noderange}->[0]);
     if (nodesmissed) {
       my $rsp = {errorcode=>1,error=>"Invalid nodes in noderange:".join(',',nodesmissed)};
+     $rsp->{serverdone} = {};
       if ($sock) {
         print $sock XMLout($rsp,RootName=>'xcatresponse' ,NoAttr=>1);
       }