git commit: BIGTOP-1129. Cannot stop datanode through init script

[rv...@apache.org]

Updated Branches:
  refs/heads/branch-0.7 4ed761972 -> ca4c88898


BIGTOP-1129. Cannot stop datanode through init script


Project: http://git-wip-us.apache.org/repos/asf/bigtop/repo
Commit: http://git-wip-us.apache.org/repos/asf/bigtop/commit/ca4c8889
Tree: http://git-wip-us.apache.org/repos/asf/bigtop/tree/ca4c8889
Diff: http://git-wip-us.apache.org/repos/asf/bigtop/diff/ca4c8889

Branch: refs/heads/branch-0.7
Commit: ca4c88898f95aaab3fd85b5e9c194ffd647c2109
Parents: 4ed7619
Author: Roman Shaposhnik <rv...@cloudera.com>
Authored: Tue Oct 29 15:33:34 2013 -0700
Committer: Roman Shaposhnik <rv...@cloudera.com>
Committed: Tue Oct 29 22:32:27 2013 -0700

----------------------------------------------------------------------
 bigtop-packages/src/common/hadoop/install_hadoop.sh | 4 ++++
 1 file changed, 4 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/bigtop/blob/ca4c8889/bigtop-packages/src/common/hadoop/install_hadoop.sh
----------------------------------------------------------------------
diff --git a/bigtop-packages/src/common/hadoop/install_hadoop.sh b/bigtop-packages/src/common/hadoop/install_hadoop.sh
index 38ccd6b..fe004a1 100755
--- a/bigtop-packages/src/common/hadoop/install_hadoop.sh
+++ b/bigtop-packages/src/common/hadoop/install_hadoop.sh
@@ -297,6 +297,10 @@ install -m 0644 \
 # conf
 install -d -m 0755 $HADOOP_ETC_DIR/conf.empty
 cp ${DISTRO_DIR}/conf.empty/mapred-site.xml $HADOOP_ETC_DIR/conf.empty
+# disable everything that's definied in hadoop-env.sh
+# so that it can still be used as example, but doesn't affect anything
+# by default
+sed -i -e '/^[^#]/s,^,#,' ${BUILD_DIR}/etc/hadoop/hadoop-env.sh
 cp ${BUILD_DIR}/etc/hadoop/* $HADOOP_ETC_DIR/conf.empty
 
 # docs