From 9a45a3dede56702853db68fdc965922e8b65a50f Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 17 Oct 2011 13:19:25 +0000
Subject: [PATCH] fix reference to remoteshell.expect

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10792 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/DSHCLI.pm |  2 +-
 perl-xCAT/xCAT/Utils.pm  | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 306ab9940..4b544c42f 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -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'}))
         {
diff --git a/perl-xCAT/xCAT/Utils.pm b/perl-xCAT/xCAT/Utils.pm
index 2d5215efb..832064099 100644
--- a/perl-xCAT/xCAT/Utils.pm
+++ b/perl-xCAT/xCAT/Utils.pm
@@ -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);
 
        }