HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from

trying to use the wrong bin directory. (omalley)


git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/branches/branch-0.20-security@1134067 13f79535-47bb-0310-9956-ffa450edef68

CHANGES.txt

@@ -88,6 +88,9 @@ Release 0.20.204.0 - unreleased
 
   BUG FIXES
 
+    HADOOP-7373. Fix {start,stop}-{dfs,mapred} and hadoop-daemons.sh from
+    trying to use the wrong bin directory. (omalley)
+
     HADOOP-7369. Fix permissions in tarball for sbin/* and libexec/* (omalley)
 
     HADOOP-7356. Fix bin/hadoop scripts (eyang via omalley)

bin/hadoop-config.sh

@@ -25,10 +25,10 @@ script="$(basename -- "$this")"
 this="$common_bin/$script"
 
 # convert relative path to absolute path
-bin=`dirname "$this"`
+config_bin=`dirname "$this"`
 script=`basename "$this"`
-bin=`cd "$bin"; pwd`
-this="$bin/$script"
+config_bin=`cd "$config_bin"; pwd`
+this="$config_bin/$script"
 
 # the root of the Hadoop installation
 export HADOOP_PREFIX=`dirname "$this"`/..