svn commit: r1342018 - in /incubator/bigtop/trunk/bigtop-packages/src: deb/hbase/service-init.d.tpl rpm/hbase/SOURCES/hbase.sh

[bmahe]

Author: bmahe
Date: Wed May 23 20:17:16 2012
New Revision: 1342018

URL: http://svn.apache.org/viewvc?rev=1342018&view=rev
Log:
BIGTOP-600. hbase init script should not source hbase-config (Jolly Chen via 
Bruno Mahé)

Modified:
    incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl
    incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh

Modified: 
incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl?rev=1342018&r1=1342017&r2=1342018&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/deb/hbase/service-init.d.tpl Wed 
May 23 20:17:16 2012
@@ -53,8 +53,11 @@ if [ -f /etc/default/hbase ] ; then
   . /etc/default/hbase
 fi
 
-if [ -f /usr/lib/hbase/bin/hbase-config.sh ] ; then
-  . /usr/lib/hbase/bin/hbase-config.sh
+# Autodetect JAVA_HOME if not defined                                          
                                                                        
+if [ -e /usr/libexec/bigtop-detect-javahome ]; then
+  . /usr/libexec/bigtop-detect-javahome
+elif [ -e /usr/lib/bigtop-utils/bigtop-detect-javahome ]; then
+  . /usr/lib/bigtop-utils/bigtop-detect-javahome
 fi
 
 if [ -z "$HBASE_PID_DIR" -o -z "$HBASE_HOME" ]; then

Modified: incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh
URL: 
http://svn.apache.org/viewvc/incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh?rev=1342018&r1=1342017&r2=1342018&view=diff
==============================================================================
--- incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh 
(original)
+++ incubator/bigtop/trunk/bigtop-packages/src/rpm/hbase/SOURCES/hbase.sh Wed 
May 23 20:17:16 2012
@@ -46,9 +46,6 @@ DAEMON_SCRIPT="/usr/lib/hbase/bin/hbase-
 NAME=HBase
 DESC="HBase daemon"
  
-if [ -f /usr/lib/hbase/bin/hbase-config.sh ] ; then
-  . /usr/lib/hbase/bin/hbase-config.sh
-fi
 install -d -m 0755 -o hbase -g hbase ${HBASE_PID_DIR}
 
 PID_FILE=${HBASE_PID_DIR}/hbase-hbase-@HBASE_DAEMON@.pid