From ea30ad1a7260bcf214cac93cd23ede6f7f3070ab Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 22 Nov 2010 07:54:02 +0000
Subject: [PATCH] fixed bug 3115035 and bug 3115135

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8225 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/FSPcfg.pm | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/perl-xCAT/xCAT/FSPcfg.pm b/perl-xCAT/xCAT/FSPcfg.pm
index bc0e254dc..7d964ff0b 100644
--- a/perl-xCAT/xCAT/FSPcfg.pm
+++ b/perl-xCAT/xCAT/FSPcfg.pm
@@ -281,12 +281,20 @@ sub fsp_api_passwd {
     # Create command and run command
     #################################
     my $cmd;
-    $cmd = "$fsp_api -a set_fsp_pw -u $user -p $passwd -P $newpasswd -t $type:$fsp_ip:$id:$node_name: ";
-
+    if( $passwd ne "" ) {
+        $cmd = "$fsp_api -a set_fsp_pw -u $user -p $passwd -P $newpasswd -t $type:$fsp_ip:$id:$node_name: ";
+    } else {
+        $cmd = "$fsp_api -a set_fsp_pw -u $user -P $newpasswd -t $type:$fsp_ip:$id:$node_name: "; 
+    }
     $SIG{CHLD} = ();
     $res = xCAT::Utils->runcmd($cmd, -1);
     $Rc = $::RUNCMD_RC;
 
+    if($Rc == 0) {
+        $res = "Success";
+    }
+
+
     ##################
     # output the prompt
     ##################