arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

more fixes for hierarchy

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13372 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2012-07-30 19:49:02 +00:00
parent 18052caaef
commit 24ce8ff3d1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
perl-xCAT/xCAT/DSHCLI.pm
View File

@ -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 =~ /(.+) -> (.+)/)
{