From 24ce8ff3d18e9218d269ba7a8021df8f770bb572 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Mon, 30 Jul 2012 19:49:02 +0000
Subject: [PATCH]  more fixes for hierarchy

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

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index fb6023aea..4a9c8d1af 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -4978,8 +4978,11 @@ sub build_merge_rsync
     my $process_line = 0;
     my $destfileisdir;
     # add merge directory to the base nodesyncfiledir
-    $nodesyncfiledir .= "/merge/mergefiles";
-    
+    if ($syncmergescript == 1) {  # syncing the xdcpmerge.sh
+      $nodesyncfiledir .= "/merge";
+    } else {   # all the other merge scripts
+       $nodesyncfiledir .= "/merge/mergefiles";
+    }
     if ($line =~ /(.+) -> (.+)/)
     {