From 2af0eff7ed2979fe14095acb86f6ecc2ad5ed5e4 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 7 Feb 2013 12:45:04 +0000
Subject: [PATCH] add -E hierarchy and  --fanout support

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15095 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-client/bin/updatenode |  1 +
 xCAT-client/bin/xdsh       | 16 +++++++++++++---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/xCAT-client/bin/updatenode b/xCAT-client/bin/updatenode
index 277f39f02..e8b7e2431 100755
--- a/xCAT-client/bin/updatenode
+++ b/xCAT-client/bin/updatenode
@@ -95,6 +95,7 @@ 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 23e0e5d5c..d42472e1c 100644
--- a/xCAT-client/bin/xdsh
+++ b/xCAT-client/bin/xdsh
@@ -215,6 +215,7 @@ 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");
@@ -349,6 +350,15 @@ 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
@@ -516,15 +526,15 @@ sub parse_args_xdsh
 #-----------------------------------------------------------------------------
 sub parse_args_xdcp
 {
-    # if not parms input error out
+
+    my %options = ();
+    # test to see if any parameters were entered
     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");