From 0635157d1a8ce68ff33072c07e087dc09f349108 Mon Sep 17 00:00:00 2001
From: lissav <lissav@us.ibm.com>
Date: Mon, 14 Apr 2014 13:07:08 -0400
Subject: [PATCH]  defect 4061

---
 perl-xCAT/xCAT/DSHCLI.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 9b09140c5..fc86ae999 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -598,7 +598,7 @@ sub _execute_dsh
                 }
                 else
                 {
-                    # LKV: This is where the output shows up
+                    # HERE: This is where the output shows up
                     #print STDOUT @{$output_buffers{$user_target}};
                     #print STDERR @{$error_buffers{$user_target}};
                     chomp(@{$output_buffers{$user_target}});
@@ -5310,7 +5310,8 @@ sub build_merge_rsync
             if ($syncmergescript == 0) { # don't add the xdcpmerge.sh line 
               push @::mergelines,$line;
             }
-            my $src_file  = $1; # merge file left of arror
+            my $src_file  = $1; # merge file left of arrow
+            my $orig_src_file = $1;
             # it will be sync'd to $nodesyncfiledir/$merge_file
             my $dest_file = $nodesyncfiledir;
             $dest_file .= $src_file;  
@@ -5339,7 +5340,7 @@ sub build_merge_rsync
                     # to pick up files from /var/xcat/syncfiles...
                     if ($onServiceNode == 1) {
                       my $newsrcfile = $syncdir;    # add SN syndir on front
-                      $newsrcfile .= $src_file;
+                      $newsrcfile .= $orig_src_file; 
                       $src_file=$newsrcfile;
                     }
                     # destination file name