arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix reference to remoteshell.expect

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10792 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2011-10-17 13:19:25 +00:00
parent 71355722fe
commit 9a45a3dede
2 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/DSHCLI.pm
View File

@ -3755,7 +3755,7 @@ sub parse_and_run_dsh
# This is checked for in the client code.
# DSH_REMOTE_PASSWORD env variable must be set to the correct
# password for the key update. This was setup in xdsh client
# frontend. remoteshell.expect depends on this
# frontend.
if (!($ENV{'DSH_REMOTE_PASSWORD'}))
{

16
perl-xCAT/xCAT/Utils.pm
View File

@ -1618,14 +1618,6 @@ sub setupSSH
$to_userid = $ENV{'DSH_TO_USERID'};
}
#if ($::XCATROOT)
#{
# $::REMOTESHELL_EXPECT = "$::XCATROOT/sbin/remoteshell.expect";
#}
#else
#{
# $::REMOTESHELL_EXPECT = "/opt/xcat/sbin/remoteshell.expect";
#}
#
# if we are running as root
@ -1652,7 +1644,7 @@ sub setupSSH
my $rc=
xCAT::RemoteShellExp->remoteshellexp("k",$::CALLBACK,$::REMOTE_SHELL);
if ($rc != 0) {
$rsp->{data}->[0] = "remoteshell.expect failed generating keys.";
$rsp->{data}->[0] = "remoteshellexp failed generating keys.";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
}
}
@ -1745,7 +1737,7 @@ rmdir \"/tmp/$to_userid\"";
my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",$enablenodes);
if ($rc != 0)
{
$rsp->{data}->[0] = "remoteshell.expect failed sending keys to enablenodes.";
$rsp->{data}->[0] = "remoteshellexp failed sending keys to enablenodes.";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
}
@ -1755,7 +1747,7 @@ rmdir \"/tmp/$to_userid\"";
my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",$disablenodes);
if ($rc != 0)
{
$rsp->{data}->[0] = "remoteshell.expect failed sending keys to disablenodes.";
$rsp->{data}->[0] = "remoteshellexp failed sending keys to disablenodes.";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
}
@ -1765,7 +1757,7 @@ rmdir \"/tmp/$to_userid\"";
my $rc=xCAT::RemoteShellExp->remoteshellexp("s",$::CALLBACK,"/usr/bin/ssh",$n_str);
if ($rc != 0)
{
$rsp->{data}->[0] = "remoteshell.expect failed sending keys.";
$rsp->{data}->[0] = "remoteshellexp failed sending keys.";
xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
}