From cbcb75cdb532028d952ef33fd2e9e21250582019 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 7 Feb 2013 12:37:58 +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@15091 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/updatenode |  1 -
 xCAT-client/bin/xdsh       | 16 +++-------------
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/xCAT-client/bin/updatenode b/xCAT-client/bin/updatenode
index e8b7e2431..277f39f02 100755
--- a/xCAT-client/bin/updatenode
+++ b/xCAT-client/bin/updatenode
@@ -95,7 +95,6 @@ if (
                 'P|scripts:s'      => \$::RERUNPS,
                 'k|security'       => \$::SECURITY,
                 'o|os:s'      	   => \$::OS,
-                'fanout=i'         => \$::fanout,
     )
   ) {
     &updatenode_usage();
diff --git a/xCAT-client/bin/xdsh b/xCAT-client/bin/xdsh
index d42472e1c..23e0e5d5c 100644
--- a/xCAT-client/bin/xdsh
+++ b/xCAT-client/bin/xdsh
@@ -215,7 +215,6 @@ sub parse_args_xdsh
         xCAT::MsgUtils->message("E", $msg);
         exit 1;
     }
-
     Getopt::Long::Configure("posix_default");
     Getopt::Long::Configure("no_gnu_compat");
     Getopt::Long::Configure("bundling");
@@ -350,15 +349,6 @@ sub parse_args_xdsh
         }
         $ENV{'DSHEXECUTE'} = $executescript;    # execute script 
     }
-    # -E <env file> option if not already exported
-     
-    if ($options{environment})
-    {  
-      if (!($ENV{'DSH_ENVIRONMENT'})) { # env  variable first 
-        $ENV{'DSH_ENVIRONMENT'} = $options{environment};    # env file 
-      }
-    }
-
 
     # find out who is the current user running xdsh
     #my $current_userid = getlogin(); # does not work for su
@@ -526,15 +516,15 @@ sub parse_args_xdsh
 #-----------------------------------------------------------------------------
 sub parse_args_xdcp
 {
-
-    my %options = ();
-    # test to see if any parameters were entered
+    # if not parms input error out
     my $arraysize=@ARGV;
     if ($arraysize ==0) {
         my $msg= "No parameters were supplied on the xdcp command. Run xdcp -h";
         xCAT::MsgUtils->message("E", $msg);
         exit 1;
     }
+
+    my %options = ();
     Getopt::Long::Configure("posix_default");
     Getopt::Long::Configure("no_gnu_compat");
     Getopt::Long::Configure("bundling");