From 175ac190027fc59db937f1fc0c570816fa47a144 Mon Sep 17 00:00:00 2001
From: jjhua <jjhua@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 12 Aug 2010 03:30:31 +0000
Subject: [PATCH] 1.fixed bug3041906 2. add enableASMI=no to site table

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

diff --git a/xCAT-server/sbin/xcatconfig b/xCAT-server/sbin/xcatconfig
index b5c9f11ba..3210766da 100644
--- a/xCAT-server/sbin/xcatconfig
+++ b/xCAT-server/sbin/xcatconfig
@@ -931,6 +931,7 @@ sub initDB
           "$::XCATROOT/sbin/chtab key=timezone site.value=$timezone;";
 
         $chtabcmds .= "$::XCATROOT/sbin/chtab key=useNmapfromMN site.value=no;";
+        $chtabcmds .= "$::XCATROOT/sbin/chtab key=enableASMI site.value=no;";
 
         if ($::osname eq 'AIX')
         {
@@ -1364,94 +1365,6 @@ sub genCredentials
 
 #-----------------------------------------------------------------------------
 
-=head3    setupAIXconserver 
-	
-    Set AIX conserver 
-
-=cut
-
-#-----------------------------------------------------------------------------
-
-sub setupAIXconserver
-
-{
-    if (!-f "/usr/sbin/conserver")
-    {
-        my $cmd = "ln -sf /opt/freeware/sbin/conserver /usr/sbin/conserver";
-        my $outref = xCAT::Utils->runcmd("$cmd", 0);
-        if ($::RUNCMD_RC != 0)
-        {
-            xCAT::MsgUtils->message(
-                'E',
-                "Could not ln -sf /opt/freeware/sbin/conserver /usr/sbin/conserver."
-                );
-        }
-        else
-        {
-            verbose("ln -sf /opt/freeware/sbin/conserver /usr/sbin/conserver.");
-        }
-    }
-    if (!-f "/usr/bin/console")
-    {
-        $cmd = "ln -sf /opt/freeware/bin/console /usr/bin/console";
-        $outref = xCAT::Utils->runcmd("$cmd", 0);
-        if ($::RUNCMD_RC != 0)
-        {
-            xCAT::MsgUtils->message(
-                  'E',
-                  "Could not ln -sf /opt/freeware/bin/console /usr/bin/console."
-                  );
-        }
-        else
-        {
-            verbose("ln -sf /opt/freeware/bin/console /usr/bin/console.");
-        }
-    }
-
-    $cmd = "lssrc -a | grep conserver >/dev/null 2>&1";
-    $outref = xCAT::Utils->runcmd("$cmd", -1);
-    if ($::RUNCMD_RC != 0)
-    {
-        $cmd =
-          "mkssys -p /opt/freeware/sbin/conserver -s conserver -u 0 -S -n 15 -f 15 -a \"-o -O1 -C /etc/conserver.cf\"";
-        $outref = xCAT::Utils->runcmd("$cmd", 0);
-        if ($::RUNCMD_RC != 0)
-        {
-            xCAT::MsgUtils->message('E', "Could not add subsystem conserver.");
-        }
-        else
-        {
-            xCAT::MsgUtils->message('I', "Added subsystem conserver.");
-
-            # Remove old setting
-            my $rmitab_cmd = 'rmitab conserver > /dev/null 2>&1';
-            my $rc         = system($rmitab_cmd);
-
-            # add to the /etc/inittab file
-            my $mkitab_cmd =
-              'mkitab "conserver:2:once:/usr/bin/startsrc -s conserver > /dev/console 2>&1" > /dev/null 2>&1';
-            $rc = system($mkitab_cmd);    # may already be there no error check
-        }
-    }
-    else
-    {                                     # conserver already a service
-                                          # Remove old setting
-        my $rmitab_cmd = 'rmitab conserver > /dev/null 2>&1';
-        my $rc         = system($rmitab_cmd);
-
-        # make sure it is registered in /etc/inittab file
-        my $mkitab_cmd =
-          'mkitab "conserver:2:once:/usr/bin/startsrc -s conserver > /dev/console 2>&1" > /dev/null 2>&1';
-        $rc = system($mkitab_cmd);        # may already be there no error check
-    }
-
-    # now make sure conserver is started
-    xCAT::Utils->startService("conserver");
-
-}
-
-#-----------------------------------------------------------------------------
-
 =head3    setupAIXIPMITool 
        
      Set AIX IPMI Tool