fix chpasswd call

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@6341 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
nott 2010-06-03 15:11:14 +00:00
parent 4d20d37a3b
commit 4513c37cf5

View File

@ -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