From 13c0a00b3465842d90ab4d4d0cebffcbe636b49d Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Sat, 4 Jul 2009 12:35:42 +0000
Subject: [PATCH] 2814391, check both /usr/local/bin and /usr/bin for rsync

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

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index d080068d6..a504b1c8d 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -3998,7 +3998,12 @@ sub parse_and_run_dcp
     {
         if ($^O eq 'aix')
         {
-            $options{'node-rcp'} = '/usr/bin/rsync';
+            if (-e ("/usr/bin/rsync")) {
+             $options{'node-rcp'} = '/usr/bin/rsync';
+            } else {
+             $options{'node-rcp'} = '/usr/local/bin/rsync';
+            }
+ 
         }
         elsif ($^O eq 'linux')
         {
diff --git a/perl-xCAT/xCAT/RSYNC.pm b/perl-xCAT/xCAT/RSYNC.pm
index 4ff98bf54..dfed398d4 100644
--- a/perl-xCAT/xCAT/RSYNC.pm
+++ b/perl-xCAT/xCAT/RSYNC.pm
@@ -11,7 +11,12 @@ use base xCAT::DSHRemoteShell;
 
 if ($^O eq 'aix')
 {
-    our $RSYNC_CMD = '/usr/bin/rsync';
+
+    if (-e ("/usr/bin/rsync")) {
+      our $RSYNC_CMD = '/usr/bin/rsync';
+    } else {
+      our $RSYNC_CMD = '/usr/local/bin/rsync';
+    }
 }
 
 if ($^O eq 'linux')