From 1535e481f809922bae4f5a44ec7e37dc0a9db007 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 9 Sep 2008 12:31:27 +0000
Subject: [PATCH]  Add check to service node plugins that are not to run on AIX

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@2104 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/AAsn.pm   | 6 +++++-
 xCAT-server/lib/xcat/plugins/DHCPsn.pm | 5 ++++-
 xCAT-server/lib/xcat/plugins/FTPsn.pm  | 9 ++++++---
 xCAT-server/lib/xcat/plugins/LDAPsn.pm | 7 +++++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/AAsn.pm b/xCAT-server/lib/xcat/plugins/AAsn.pm
index 78e57199f..cdcf47572 100644
--- a/xCAT-server/lib/xcat/plugins/AAsn.pm
+++ b/xCAT-server/lib/xcat/plugins/AAsn.pm
@@ -15,7 +15,7 @@ use Getopt::Long;
 =head1
 
   mounts /install if site.installloc set
-
+  on a Linux Service Node
 
 #-------------------------------------------------------
 
@@ -35,6 +35,10 @@ sub handled_commands
     if ($ENV{'XCATBYPASS'}) {
        return 0;
     }
+    if (xCAT::Utils->isAIX()) { # do not run on AIX
+       return 0;
+    }
+
 
     my $rc = 0;
 
diff --git a/xCAT-server/lib/xcat/plugins/DHCPsn.pm b/xCAT-server/lib/xcat/plugins/DHCPsn.pm
index d567cd9c7..872caa85d 100644
--- a/xCAT-server/lib/xcat/plugins/DHCPsn.pm
+++ b/xCAT-server/lib/xcat/plugins/DHCPsn.pm
@@ -21,7 +21,7 @@ use Getopt::Long;
 
 =head3  handled_commands 
 
-Check to see if on a Service Node
+Check to see if on a Linux Service Node
 Check database to see if this node is a DHCP server
 Call  setup_DHCP
 
@@ -35,6 +35,9 @@ sub handled_commands
     if ($ENV{'XCATBYPASS'}) {
        return 0;
     }
+    if (xCAT::Utils->isAIX()) { # do not run on AIX
+       return 0;
+    }
 
     my $rc = 0;
     if (xCAT::Utils->isServiceNode())
diff --git a/xCAT-server/lib/xcat/plugins/FTPsn.pm b/xCAT-server/lib/xcat/plugins/FTPsn.pm
index 4a6766489..c31acf28b 100644
--- a/xCAT-server/lib/xcat/plugins/FTPsn.pm
+++ b/xCAT-server/lib/xcat/plugins/FTPsn.pm
@@ -13,16 +13,16 @@ use Getopt::Long;
 #-------------------------------------------------------
 
 =head1
-  xCAT plugin package to setup vstftp on a  service node
+  xCAT plugin package to setup vstftp on a  Linux service node
 
 
 #-------------------------------------------------------
 
 =head3  handled_commands
 
-This runs on Service Node
+This runs on Linux Service Node
 Checks servicenode table ftpserver attribute
-Call  setup_TFTP  (actually setting up atftp)
+Call  setup_TFTP  (actually setting up vstftp)
 
 =cut
 
@@ -34,6 +34,9 @@ sub handled_commands
     if ($ENV{'XCATBYPASS'}) {
        return 0;
     }
+    if (xCAT::Utils->isAIX()) { # do not run on AIX
+       return 0;
+    }
 
     my $rc = 0;
 
diff --git a/xCAT-server/lib/xcat/plugins/LDAPsn.pm b/xCAT-server/lib/xcat/plugins/LDAPsn.pm
index 24aa0288f..8a50cebe6 100644
--- a/xCAT-server/lib/xcat/plugins/LDAPsn.pm
+++ b/xCAT-server/lib/xcat/plugins/LDAPsn.pm
@@ -12,7 +12,7 @@ use Getopt::Long;
 #-------------------------------------------------------
 
 =head1 
-  xCAT plugin package to setup of LDAP on the ServiceNode 
+  xCAT plugin package to setup of LDAP on the Linux ServiceNode 
 
 
 #-------------------------------------------------------
@@ -33,7 +33,10 @@ sub handled_commands
     if ($ENV{'XCATBYPASS'}) {
        return 0;
     }
-
+    if (xCAT::Utils->isAIX()) { # do not run on AIX
+       return 0;
+    }
+ 
     my $rc = 0;
     if (xCAT::Utils->isServiceNode())
     {