commit 3f6d7a6ce2236292a2d044b5c3c80bdec28b2922
author Elek, Márton <elek@users.noreply.github.com> Tue Jun 11 20:07:12 2019 +0200
committer Anu Engineer <aengineer@apache.org> Tue Jun 11 11:07:12 2019 -0700
tree 729eea931a68062247a525cffc81751198617c63
parent cef996659f43d165ca8ba451074a4eac21dcf525

HDDS-1630. Copy default configuration files to the writeable directory (#888)

scripts/starter.sh

diff --git a/scripts/starter.sh b/scripts/starter.sh
index 6b5bbe2..30ec55f 100755
--- a/scripts/starter.sh
+++ b/scripts/starter.sh
@@ -96,7 +96,19 @@
     sed "s/SERVER/$KERBEROS_SERVER/g" "$DIR"/krb5.conf | sudo tee /etc/krb5.conf
 fi
 
-"$DIR"/envtoconf.py --destination "${HADOOP_CONF_DIR:-/opt/hadoop/etc/hadoop}"
+
+CONF_DESTINATION_DIR="${HADOOP_CONF_DIR:-/opt/hadoop/etc/hadoop}"
+
+#Try to copy the defaults
+set +e
+if [[ -d "/opt/ozone/etc/hadoop" ]]; then
+   cp /opt/hadoop/etc/hadoop/* "$CONF_DESTINATION_DIR/" > /dev/null 2>&1
+elif [[ -d "/opt/hadoop/etc/hadoop" ]]; then
+   cp /opt/hadoop/etc/hadoop/* "$CONF_DESTINATION_DIR/" > /dev/null 2>&1
+fi
+set -e
+
+"$DIR"/envtoconf.py --destination "$CONF_DESTINATION_DIR"
 
 if [ -n "$ENSURE_NAMENODE_DIR" ]; then
   CLUSTERID_OPTS=""