From 2fd76e94c098ddd5603f5528d53a626d675217d3 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Wed, 3 Jun 2009 14:38:12 +0000
Subject: [PATCH] fix syncing of Service node files with dcp ( -s option)

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

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 24b5b4988..60e824cea 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -936,7 +936,7 @@ sub fork_fanout_dcp
                           "/bin/cp $src_file_diff_dest $dest_dir/$diff_basename\n";
                     }
                 }
-                print RSYNCCMDFILE "/bin/rm -f /tmp/rsync_$user_target\n";
+                #print RSYNCCMDFILE "/bin/rm -f /tmp/rsync_$user_target\n";
                 close RSYNCCMDFILE;
                 chmod 0755, "/tmp/rsync_$user_target";
                 @dcp_command = ('/bin/sh', '-c', "/tmp/rsync_$user_target");
@@ -4296,6 +4296,11 @@ sub parse_rsync_input_file
                     {    # get the file name from the destination
                         $dest_basename = basename($dest_file);
                     }
+                    if ($rsyncSN == 1) # dest file will be the same as src
+                    {    #  syncing the SN
+                        $dest_basename = $src_basename;
+                    }
+                    $$options{'destDir_srcFile'}{$target_node}{$dest_dir} ||=
                     $dest_basename =~ s/[\s;]//g;
 
                     # if the filename will be the same at the destination