From 1ea136fffb75370d96805a2deefc493b8c16591f Mon Sep 17 00:00:00 2001
From: mellor <mellor@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Tue, 22 Mar 2011 15:06:13 +0000
Subject: [PATCH] xcatd - export EXTSHM and DB2INSTANCE for db2 use, LL calls,
 CNM calls

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9128 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-server/lib/xcat/plugins/rollupdate.pm | 3 ---
 xCAT-server/sbin/xcatd                     | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xCAT-server/lib/xcat/plugins/rollupdate.pm b/xCAT-server/lib/xcat/plugins/rollupdate.pm
index d59496e84..58662431b 100644
--- a/xCAT-server/lib/xcat/plugins/rollupdate.pm
+++ b/xCAT-server/lib/xcat/plugins/rollupdate.pm
@@ -136,9 +136,6 @@ sub process_request {
     $::SUBREQ   = shift;
     my $ret;
 
-    # ENV variable required by all LL commands
-    $ENV{'EXTSHM'} = 'ON';
-
     # globals used by all subroutines.
     $::command   = $::request->{command}->[0];
     $::args      = $::request->{arg};
diff --git a/xCAT-server/sbin/xcatd b/xCAT-server/sbin/xcatd
index cf0b58b0d..f3e9493b7 100755
--- a/xCAT-server/sbin/xcatd
+++ b/xCAT-server/sbin/xcatd
@@ -6,6 +6,9 @@ use Carp qw(cluck confess);
 BEGIN
 {
     $::XCATROOT = $ENV{'XCATROOT'} ? $ENV{'XCATROOT'} : '/opt/xcat';
+     # Required when using DB2 as the xCAT database:
+     $ENV{'DB2INSTANCE'} = 'xcatdb';
+     $ENV{'EXTSHM'} = 'ON';
 }
 
 # if AIX - make sure we include perl 5.8.2 in INC path.