From da0431e69a3ea55a7fe2e33facd2248eca3db63d Mon Sep 17 00:00:00 2001
From: Arif Ali <mail@arif-ali.co.uk>
Date: Fri, 11 Apr 2014 14:52:45 +0100
Subject: [PATCH] defect #4061: fix DSHCLI.pm for merge in hierarchy

---
 perl-xCAT/xCAT/DSHCLI.pm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 9b09140c5..dc7d838c3 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -5311,6 +5311,7 @@ sub build_merge_rsync
               push @::mergelines,$line;
             }
             my $src_file  = $1; # merge file left of arror
+            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