From a8c8ff5f45fdac58cb974d0c5f5c2e4608cfaa5c Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 3 Dec 2009 12:11:18 +0000
Subject: [PATCH] xdsh/dcp context no longer checks the rsh/rcp attribute in
the site table, these attributes are being sunset. Only useSSHonAIX used
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@4715 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
xCAT-server/lib/xcat/dsh/Context/XCAT.pm | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/xCAT-server/lib/xcat/dsh/Context/XCAT.pm b/xCAT-server/lib/xcat/dsh/Context/XCAT.pm
index 0ff1b0e1a..55eaa18d1 100644
--- a/xCAT-server/lib/xcat/dsh/Context/XCAT.pm
+++ b/xCAT-server/lib/xcat/dsh/Context/XCAT.pm
@@ -287,14 +287,14 @@ sub resolve_node
=head3
get_xcat_remote_cmds
- Using xCAT native commands, store the remote command settings for
- the remote shell and remote copy commands as defined in xCAT
- site table .
- if no site table (rsh, rcp attribute) definition, then
+ Using xCAT native commands,check the useSSHonAIX attribute for AIX
on Linux use ssh
- on AIX, check for ssh and use it is installed and configured
+ on AIX, check for useSSHonAIX, if says use ssh and
+ it is installed and configured, use it
, otherwise use rsh
+ site.rsh and site.rcp are no longer used
+
Arguments:
None
@@ -339,17 +339,6 @@ sub get_xcat_remote_cmds
$XCAT_RCP_CMD = "/usr/bin/rcp";
}
}
- # override with site table settings, if they exist
- my @remote_shell = xCAT::Utils->get_site_attribute("rsh");
- if ($remote_shell[0])
- {
- $XCAT_RSH_CMD = $remote_shell[0];
- }
- my @remote_copy = xCAT::Utils->get_site_attribute("rcp");
- if ($remote_copy[0])
- {
- $XCAT_RCP_CMD = $remote_copy[0];
- }
}