From 9ad409f44773f18f7aabd43680d1e27443cde009 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 25 Jun 2009 15:56:15 +0000
Subject: [PATCH] fix spelling of SNsyncfiledir

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3637 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/DSHCLI.pm | 27 ++++++++++++++++++++-------
 perl-xCAT/xCAT/Schema.pm |  2 +-
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index e9b42e12a..bf85bf370 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -656,7 +656,6 @@ sub _execute_dsh
     return @targets_failed;
 }
 
-
 #----------------------------------------------------------------------------
 
 =head3
@@ -4041,17 +4040,27 @@ sub parse_and_run_dcp
         return;
 
     }
+
+    my $synfiledir = "/var/xcat/syncfiles";
     if ($options{'rsyncSN'})
     {
         $syncSN = 1;
+
+        # get the directory on the servicenode to put the rsync files in
+        my @syndir = xCAT::Utils->get_site_attribute("SNsyncfiledir");
+        if ($syndir[0])
+        {
+            $synfiledir = $syndir[0];
+        }
+
     }
 
     # if rsyncing the nodes
     if ($options{'File'})
     {
         my $rc =
-          &parse_rsync_input_file(\@nodelist,       \%options,
-                                  $options{'File'}, $syncSN);
+          &parse_rsync_input_file(\@nodelist, \%options, $options{'File'},
+                                  $syncSN, $synfiledir);
         if ($rc == 1)
         {
             $rsp->{data}->[0] = "Error parsing the rsync file";
@@ -4249,7 +4258,9 @@ sub rsync_to_image
           /.../file1 /..../filex  -> /...../dir1
 
         Arguments:
-		  Input nodelist,options, pointer to the sync file 
+		  Input nodelist,options, pointer to the sync file and
+		  if syncing to a service node,  the directory to syn the files to
+		  based on defaults or the site.SNsyncfiledir attribute
 
         Returns:
            Errors if invalid options or the executed dcp command
@@ -4271,7 +4282,7 @@ sub rsync_to_image
 sub parse_rsync_input_file
 {
     use File::Basename;
-    my ($nodes, $options, $input_file, $rsyncSN) = @_;
+    my ($nodes, $options, $input_file, $rsyncSN, $syncdir) = @_;
     my @dest_host    = @$nodes;
     my $process_line = 0;
     open(INPUTFILE, "< $input_file") || die "File $input_file does not exist\n";
@@ -4306,10 +4317,12 @@ sub parse_rsync_input_file
                 {
 
                     #  if syncing the Service Node, file goes to the same place
-                    # from which it came
+                    # from which it came in the input syncdir on the service
+                    # node
                     if ($rsyncSN == 1)
                     {    #  syncing the SN
-                        $dest_dir = dirname($srcfile);
+                        $dest_dir = $syncdir;    # the SN sync dir
+                        $dest_dir .= dirname($srcfile);
                         $dest_dir =~ s/\s*//g;    #remove blanks
                     }
                     $$options{'destDir_srcFile'}{$target_node}{$dest_dir} ||=
diff --git a/perl-xCAT/xCAT/Schema.pm b/perl-xCAT/xCAT/Schema.pm
index 4b6239d17..3c063b827 100644
--- a/perl-xCAT/xCAT/Schema.pm
+++ b/perl-xCAT/xCAT/Schema.pm
@@ -544,7 +544,7 @@ site => {
    "  useSSHonAIX:\t(yes/1 or no/0). If yes, ssh/scp will be setup and used. If no, rsh/rcp will be setup and used on AIX.\n\n".
    "  rsh:\tpath to remote shell command for xdsh.\n\n".
    "  rcp:\tpath to remote copy command for xdcp.\n\n".
-   "  SNsynfiledir:\tThe directory on the Service Node, where xdcp will sync the files from the MN that will eventually be sync'd to the compute nodes. Default is /var/xcat/syncfiles.\n\n".
+   "  SNsyncfiledir:\tThe directory on the Service Node, where xdcp will sync the files from the MN that will eventually be sync'd to the compute nodes. Default is /var/xcat/syncfiles.\n\n".
    "  snmpc:\tThe snmp community string that xcat should use when communicating with the switches.\n\n".
    "  svloglocal:\tsyslog on the service node does not get forwarded to the mgmt node - default is 0.\n\n".
    "  xcatconfdir:\t(default /etc/xcat)\n\n".