From 1b336f15be62f40dea33b6f07bbc16c4924080d7 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 17 Aug 2012 11:39:23 +0000
Subject: [PATCH] defect 3414740 Merge aixremoteshell/remoteshell

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13544 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/sbin/xcatconfig | 54 ++++++++++++++++++++++++++++++-------
 1 file changed, 45 insertions(+), 9 deletions(-)

diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index 4cae5bf22..22a8481e9 100755
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -1110,7 +1110,7 @@ sub initDB
         if ($::osname eq 'AIX') {  # we don't use otherpkgs on AIX
 
            $chtabcmds .=
-                  "$::XCATROOT/sbin/chtab node=xcatdefaults postscripts.postscripts='syslog,aixremoteshell,syncfiles';";
+                  "$::XCATROOT/sbin/chtab node=xcatdefaults postscripts.postscripts='syslog,remoteshell,syncfiles';";
            $chtabcmds .=
                "$::XCATROOT/sbin/chtab node=service postscripts.postscripts='servicenode'";
 
@@ -1789,6 +1789,18 @@ sub setuphttp
    are not called by servicenode
 
    ..."servicenode,xcatserver,xcatclient.."... 
+    becomes
+   ..."servicenode,.."... 
+ 
+
+   Any line in the postscripts table that has aixremoteshell, 
+   aixremoteshell will be replaced by remoteshell unless it is
+   already on the line.  remoteshell now calls aixremoteshell, if on an
+   AIX node.  
+
+   ...,"syslog,aixremoteshell,syncfiles",,, 
+   becomes
+   ...,"syslog,remoteshell,syncfiles",,, 
 
 =cut
 
@@ -1802,30 +1814,54 @@ sub cleanupPSTable
    foreach my $entry (@tableentries) {
      my $changeit=0;
      my $node=$entry->{'node'};
-     my $pslist=$entry->{'postscripts'};
+     my $pslist=$entry->{'postscripts'};  # get list of postscripts on the line
      if ($pslist) {
        my $servicenode=0;
+       my $aixremoteshell=0;
+       my $remoteshell=0;
        my $newpslist ="\'";
        my @ps= split(",", $pslist);    
-       # now check is servicenode and xcatclient and/or xcatserver in the list
+       # now check is servicenode and xcatclient and/or xcatserver on the line 
        foreach my $pscript (@ps) {
+         # check for aixremoteshell, need to replace with remoteshell
+         if ($pscript =~ /(^|\|)aixremoteshell($|\|)/i) { 
+            $aixremoteshell=1;
+         }
+         if ($pscript =~ /(^|\|)remoteshell($|\|)/i) { 
+            $remoteshell=1;
+         }
          if ($pscript =~ /(^|\|)servicenode($|\|)/i) { # found servicenode ps
             $newpslist .=$pscript;
             $newpslist .=",";
             $servicenode=1; 
-         } else{  # no service node just put entry on new table
-            if ($servicenode == 0) { 
+         } else{  # process rest of ps list 
+            # if servicenode and aixremoteshell not found on the line go
+            # to the next line
+            if (($servicenode == 0) && ($aixremoteshell ==0)) { 
                $newpslist .=$pscript;
                $newpslist .=",";
-            } else { # servicenode found, do not keep xcatserver/xcatclient 
+          
+            } else {  
+             # servicenode found, do not keep xcatserver/xcatclient or
+             # aixremoteshell, and no remoteshell replace with remoteshell
+             if (($aixremoteshell == 1) && ($remoteshell == 0)) {  
+                $newpslist .="remoteshell,";
+                $changeit=1; # had to replace aixremoteshell 
+                next;
+             }
+             # if already put in remoteshell, then skip any more
+             # occurances of remoteshell on the line 
+             if (($aixremoteshell == 1) && ($remoteshell == 1)) {  
+                next;
+             } 
              if (($pscript =~ /(^|\|)xcatserver($|\|)/i) ||($pscript =~ /(^|\|)xcatclient($|\|)/i))  {
                    $changeit=1; # had to remove xcatserver/xcatclient 
                    next;
-               } else {
+              } else {
                  $newpslist .=$pscript;
                  $newpslist .=",";
-               }
-            }
+              }
+            } # end servicenode processing
          }
        }
        chop $newpslist;