add passive fixes to init.d scripts and some distro specific stuff to…

… the .conf.debian
eucalyptus · May 1, 2009 · 0220af9 · 0220af9
2 parents 028eeee + 960af11
commit 0220af9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 4 deletions.
diff --git a/tools/eucalyptus-cc.in b/tools/eucalyptus-cc.in
@@ -45,7 +45,10 @@ NAME=eucalyptus-cc
 
 # honor the ENV variable if found otherwise look in root
 if [ -z "$EUCALYPTUS" ] ; then
-	EUCALYPTUS="@prefix@"
+       EUCALYPTUS="@prefix@"                                   
+       if [ ! -e ${EUCALYPTUS}/etc/eucalyptus/eucalyptus.conf ] ; then
+              EUCALYPTUS="/"                                   
+       fi   
 fi
 export EUCALYPTUS
 

diff --git a/tools/eucalyptus-cloud.in b/tools/eucalyptus-cloud.in
@@ -52,7 +52,10 @@ JAVA="`which java 2> /dev/null`"
 
 # honor the ENV variable if found otherwise look in root
 if [ -z "$EUCALYPTUS" ] ; then
-	EUCALYPTUS="@prefix@"
+       EUCALYPTUS="@prefix@"
+       if [ ! -e ${EUCALYPTUS}/etc/eucalyptus/eucalyptus.conf ] ; then 
+              EUCALYPTUS="/"
+       fi
 fi
 export EUCALYPTUS
 

diff --git a/tools/eucalyptus-nc.in b/tools/eucalyptus-nc.in
@@ -47,7 +47,10 @@ MODPROBE="`which modprobe 2> /dev/null`"
 
 # honor the ENV variable if found otherwise look in root
 if [ -z "$EUCALYPTUS" ] ; then
-	EUCALYPTUS="@prefix@"
+       EUCALYPTUS="@prefix@"                                   
+       if [ ! -e ${EUCALYPTUS}/etc/eucalyptus/eucalyptus.conf ] ; then
+              EUCALYPTUS="/"                                   
+       fi   
 fi
 export EUCALYPTUS
 

diff --git a/tools/eucalyptus.conf.debian b/tools/eucalyptus.conf.debian
@@ -8,7 +8,7 @@
 
 # This variable point to where eucalyptus has been installed.
 EUCALYPTUS="/"
-
+AXIS2C_HOME=/usr/lib/axis2
 # This is the username that you require eucalyptus to run as
 EUCA_USER="eucalyptus"