From a7142277ccb8468247f495255712f7bc1c1062c0 Mon Sep 17 00:00:00 2001 From: lissav Date: Fri, 29 Apr 2011 15:01:58 +0000 Subject: [PATCH] support wse and wser git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9430 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT/postscripts/db2install | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/xCAT/postscripts/db2install b/xCAT/postscripts/db2install index 0ff564581..91aef8a7f 100755 --- a/xCAT/postscripts/db2install +++ b/xCAT/postscripts/db2install @@ -353,18 +353,29 @@ sub installdb2code my $installcode; my $installcode1 = "$::installloc/ese/db2_install"; my $installcode2 = "$::installloc/server/db2_install"; + my $installcode3 = "$::installloc/wser/db2_install"; + my $installcode4 = "$::installloc/wse/db2_install"; - if ((!(-e $installcode1)) && (!(-e $installcode2))) + if ((!(-e $installcode1)) && (!(-e $installcode2)) && (!(-e $installcode3)) && (!(-e $installcode4))) { $msg = "db2install:Install code does not exist. Cannot install DB2 code.\n"; `logger -t xcat $msg`; exit 1; } + # pick the correct install directory if (-e $installcode1 ) { $installcode=$installcode1; } else { - $installcode=$installcode2; - } + if (-e $installcode2 ) { + $installcode=$installcode2; + } else { + if (-e $installcode3 ) { + $installcode=$installcode3; + } else { + $installcode=$installcode4; + } + } + } my $expect_log = "/tmp/xcatexpect.log"; $msg =