From 9e3b054fc1c698a2f814859c4278955b5f577bd7 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 17 Oct 2011 13:35:00 +0000
Subject: [PATCH] more conversion to RemoteShellExp.pm

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@10793 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/xdsh | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/xCAT-client/bin/xdsh b/xCAT-client/bin/xdsh
index 4403b98de..bfeec3e06 100644
--- a/xCAT-client/bin/xdsh
+++ b/xCAT-client/bin/xdsh
@@ -18,6 +18,7 @@ use Getopt::Long;
 require xCAT::MsgUtils;
 require xCAT::DSHCLI;
 use xCAT::Utils;
+use xCAT::RemoteShellExp;
 require xCAT::Client;
 my $bname = basename($0);
 
@@ -426,25 +427,16 @@ sub parse_args_xdsh
         #
         if ($current_userid ne "root")
         {
-            if ($::XCATROOT)
-            {
-                $::REMOTESHELL_EXPECT = "$::XCATROOT/sbin/remoteshell.expect";
-            }
-            else
-            {
-                $::REMOTESHELL_EXPECT = "/opt/xcat/sbin/remoteshell.expect";
-            }
-            $::REMOTE_SHELL = "/usr/bin/ssh";
+             $::REMOTE_SHELL = "/usr/bin/ssh";
+             my $callback = \&xCAT::Client::handle_response;
+             # generates new keys for non-root id, if they do not already exist
+             my $rc=
+             xCAT::RemoteShellExp->remoteshellexp("k",$callback,$::REMOTE_SHELL);
+             if ($rc != 0) {
+               $msg = "remoteshellexp failed generating keys.";
+               xCAT::MsgUtils->message("E", $msg);
+             }
 
-            # generates new keys, if they do not already exist
-            xCAT::Utils->runcmd("$::REMOTESHELL_EXPECT -k", 0);
-            if ($::RUNCMD_RC != 0)
-            {    # error
-                $msg = "remoteshell.expect failed generating keys.";
-                xCAT::MsgUtils->message("E", $msg);
-                exit 2;
-
-            }
 
         }
     }    # end setup of ssh