From 1e9af7be3bcd88fd4c36f75358796f94d22afdfc Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 7 Feb 2013 12:36:47 +0000
Subject: [PATCH] remove what should have been a 2.9 checkin

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/branches/2.8@15090 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/DSHCLI.pm | 26 ++------------------------
 perl-xCAT/xCAT/Usage.pm  |  6 +-----
 2 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 091f7e050..0ab10d35f 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -1034,28 +1034,6 @@ sub fork_fanout_dsh
 
         if ($$options{'environment'})
         {
-            # if we are on a servicenode need to get the environment file
-            # from the SNsyncfiledir, not local
-            if (xCAT::Utils->isServiceNode()) {
-              my $newenvfile;
-              my $synfiledir = "/var/xcat/syncfiles"; #default
-
-              # get the directory on the servicenode to and add to filepath 
-              my @syndir= xCAT::TableUtils->get_site_attribute("SNsyncfiledir");
-              if ($syndir[0])
-              {
-                $synfiledir = $syndir[0];
-              }
-              $newenvfile = $synfiledir;
-              $newenvfile .= $$options{'environment'};
-              $$options{'environment'} =  $newenvfile;
-            }
-            if (!(-e $$options{'environment'}))
-            {
-              my $rsp={};
-               $rsp->{error}->[0] = "File $$options{'environment'} does not exist";
-               xCAT::MsgUtils->message("E", $rsp, $::CALLBACK);
-            }
             push @dsh_command,
               "$$options{'pre-command'} . $$options{'environment'} ; $$options{'command'}$$options{'post-command'}";
         }
@@ -1185,13 +1163,13 @@ sub fork_fanout_dsh
             if ($$options{'execute'})
             {
                 # first build the scp command to copy the file to execute
-                # down to the node into /tmp/*.dsh 
+                # down to the node into /tmp/*.dsh
                 my $rsp = {};
                 $rsp->{data}->[0] = "TRACE: Execute option specified.";
                 $dsh_trace && (xCAT::MsgUtils->message("I", $rsp, $::CALLBACK));
 
                 my %exe_rcp_config = ();
-                $tmp_cmd_file = POSIX::tmpnam . ".dsh"; 
+                $tmp_cmd_file = POSIX::tmpnam . ".dsh";
 
                 my ($exe_cmd, @args) = @{$$options{'execute'}};
                 my $chmod_cmd = "";
diff --git a/perl-xCAT/xCAT/Usage.pm b/perl-xCAT/xCAT/Usage.pm
index b43e3f1a3..4597f15ad 100644
--- a/perl-xCAT/xCAT/Usage.pm
+++ b/perl-xCAT/xCAT/Usage.pm
@@ -327,7 +327,7 @@ my %usage = (
     or
     updatenode <noderange> [-V|--verbose] [-k|--security] [-s|--sn]
     or
-    updatenode <noderange> [-V|--verbose] [-F|--sync | -f|--snsync] [-l|--user[username]] [--fanout=[fanout value]] [-S|--sw] 
+    updatenode <noderange> [-V|--verbose] [-F|--sync | -f|--snsync] [-l|--user[username]] [-S|--sw] 
         [-P|--scripts [script1,script2,...]] [-s|--sn] 
         [-A|--updateallsw] [-c|--cmdlineonly] [-d alt_source_dir]
         [attr=val [attr=val...]]
@@ -342,12 +342,8 @@ Options:
 
     [-F|--sync] Perform File Syncing.
 
-    [--fanout]  Allows you to assign the fanout value for the command. 
-        See xdsh/xdcp fanout parameter in the man page.
-
     [-f|--snsync] Performs File Syncing to the service nodes that service 
         the nodes in the noderange.
-
     [-l|--user] User name to run the updatenode command.  It overrides the
         current user which is the default.