From 864348ce03d417ffbce462737c76b8f94b3accd7 Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 3 Mar 2011 13:55:42 +0000
Subject: [PATCH] fix defect 3198081, need to look for either ese or server as
 top directory

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@8971 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT/postscripts/db2install | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/xCAT/postscripts/db2install b/xCAT/postscripts/db2install
index 67b5ec51c..d9231b303 100755
--- a/xCAT/postscripts/db2install
+++ b/xCAT/postscripts/db2install
@@ -349,14 +349,21 @@ sub installdb2code
 {
     my $msg;
     my $rc          = 0;
-    my $installcode = "$::installloc/ese/db2_install";
+    my $installcode;
+    my $installcode1 = "$::installloc/ese/db2_install";
+    my $installcode2 = "$::installloc/server/db2_install";
 
-    if (!(-e $installcode))
+    if ((!(-e $installcode1)) && (!(-e $installcode2)))
     {
-        $msg = "db2install:$installcode does not exist. Cannot install DB2 code.\n";
+        $msg = "db2install:Install code  does not exist. Cannot install DB2 code.\n";
         `logger -t xcat $msg`;
         exit 1;
     }
+    if (-e $installcode1 ) {
+      $installcode=$installcode1;
+    } else {
+      $installcode=$installcode2;
+    }
 
     my $expect_log = "/tmp/xcatexpect.log";
     $msg =