Merge -r 1170041:1170042 from branch-0.20-security onto branch-0.20-security-205

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

CHANGES.txt

@@ -134,6 +134,8 @@ Release 0.20.205.0 - 2011.09.12
     HDFS-1260. Block lost when multiple DNs trying to recover it to different
     genstamps. (Todd Lipcon via jitendra)
 
+    HADOOP-7626. Bugfix for a config generator (Eric Yang via ddas)
+
   IMPROVEMENTS
 
     MAPREDUCE-2187. Reporter sends progress during sort/merge. (Anupam Seth via

src/packages/templates/conf/hadoop-env.sh

@@ -12,7 +12,7 @@ export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-"/etc/hadoop"}
 # Extra Java CLASSPATH elements.  Automatically insert capacity-scheduler.
 for f in $HADOOP_HOME/contrib/capacity-scheduler/*.jar; do
   if [ "$HADOOP_CLASSPATH" ]; then
-    export HADOOP_CLASSPATH=${HADOOP_CLASSPATH}:$f
+    export HADOOP_CLASSPATH=$HADOOP_CLASSPATH:$f
   else
     export HADOOP_CLASSPATH=$f
   fi
@@ -23,7 +23,7 @@ done
 #export HADOOP_NAMENODE_INIT_HEAPSIZE=""
 
 # Extra Java runtime options.  Empty by default.
-export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true ${HADOOP_OPTS}"
+export HADOOP_OPTS="-Djava.net.preferIPv4Stack=true $HADOOP_OPTS"
 
 # Command specific options appended to HADOOP_OPTS when specified
 export HADOOP_NAMENODE_OPTS="-Dsecurity.audit.logger=INFO,DRFAS -Dhdfs.audit.logger=INFO,DRFAAUDIT ${HADOOP_NAMENODE_OPTS}"