Author: rvs
Date: Tue Mar 6 01:17:55 2012
New Revision: 1297315
URL: http://svn.apache.org/viewvc?rev=1297315&view=rev
Log:
BIGTOP-429. CATALINA_PID needs to be updated in hadoop-httpfs.default to
correspond to the calculated value
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default?rev=1297315&r1=1297314&r2=1297315&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/common/hadoop/hadoop-httpfs.default
Tue Mar 6 01:17:55 2012
@@ -16,7 +16,7 @@ export HTTPFS_USER=httpfs
export HTTPFS_CONFIG=/etc/hadoop-httpfs/conf
export HTTPFS_LOG=/var/log/hadoop-httpfs/
export HTTPFS_TEMP=/var/run/hadoop-httpfs/
-export CATALINA_PID=/var/run/hadoop-httpfs/hadoop-httpfs.pid
+export CATALINA_PID=/var/run/hadoop-httpfs/hadoop-httpfs-httpfs.pid
export CATALINA_BASE=/usr/lib/hadoop-httpfs
export CATALINA_TMPDIR=/var/run/hadoop-httpfs/
export CATALINA_HOME=/usr/lib/bigtop-tomcat
Modified:
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
URL:
http://svn.apache.org/viewvc/incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec?rev=1297315&r1=1297314&r2=1297315&view=diff
==============================================================================
---
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
(original)
+++
incubator/bigtop/branches/hadoop-0.23/bigtop-packages/src/rpm/hadoop/SPECS/hadoop.spec
Tue Mar 6 01:17:55 2012
@@ -104,7 +104,7 @@
/usr/lib/rpm/brp-compress ; \
%{nil}
-%define libexecdir %{_libexecdir}
+%define libexecdir /usr/lib
%define doc_hadoop %{_docdir}/%{name}
%define alternatives_cmd update-alternatives
%global initd_dir %{_sysconfdir}/rc.d
@@ -393,7 +393,7 @@ bash %{SOURCE2} \
--man-dir=$RPM_BUILD_ROOT%{man_hadoop} \
# Replace the bundled jsvc with a link to a bigtop-jsvc one
-%__ln_s -f /usr/lib/bigtop-utils/jsvc
$RPM_BUILD_ROOT/%{lib_hadoop}/libexec/jsvc
+%__ln_s -f %{libexecdir}/bigtop-utils/jsvc
$RPM_BUILD_ROOT/%{lib_hadoop}/libexec/jsvc
# Init.d scripts
%__install -d -m 0755 $RPM_BUILD_ROOT/%{initd_dir}/
