From 4513c37cf52ef90d9f5f19bb7a7760d6fed9a15f Mon Sep 17 00:00:00 2001
From: nott <nott@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 3 Jun 2010 15:11:14 +0000
Subject: [PATCH] fix chpasswd call

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

diff --git a/xCAT-server/lib/xcat/plugins/aixinstall.pm b/xCAT-server/lib/xcat/plugins/aixinstall.pm
index 6e0435f93..434bba5a3 100644
--- a/xCAT-server/lib/xcat/plugins/aixinstall.pm
+++ b/xCAT-server/lib/xcat/plugins/aixinstall.pm
@@ -1194,13 +1194,9 @@ srvnode.";
     }    # end - if UPDATE
 
     # ok -then the spot can be updated
-    if ($::VERBOSE)
-    {
-        my $rsp;
-        push @{$rsp->{data}},
-          "Updating the NIM spot resource named \'$spot_name\'.\n";
-        xCAT::MsgUtils->message("I", $rsp, $callback);
-    }
+	my $rsp;
+	push @{$rsp->{data}}, "Updating the NIM spot resource named \'$spot_name\'.\n";
+	xCAT::MsgUtils->message("I", $rsp, $callback);
 
     #
     # update spot with additional software if have bnds
@@ -2585,7 +2581,7 @@ sub mknimimage
 		chomp $rootpw;
 		my $pwcmd;
 		if ($method) {
-			$pwcmd = qq~xcatchroot -i $spot_name "/usr/bin/echo root:$rootpw | /usr/bin/chpasswd -e" >/dev/null 2>&1~;
+			$pwcmd = qq~xcatchroot -i $spot_name "/usr/bin/echo root:$rootpw | /usr/bin/chpasswd -e -c" >/dev/null 2>&1~;
 		} else {
 			$pwcmd = qq~xcatchroot -i $spot_name "/usr/bin/echo root:$rootpw | /usr/bin/chpasswd -c" >/dev/null 2>&1~;
 		}
@@ -6593,6 +6589,10 @@ sub mkdsklsnode
         }
     }
 
+	my $rsp;
+	$rsp->{data}->[0] = "$Sname: Initializing AIX diskless nodes.  This could take a while.\n";
+	xCAT::MsgUtils->message("I", $rsp, $callback);
+
     #
     #  Get a list of the defined NIM machines
     #    these are machines defined on this server