From 297b0ffa59175859397a08e36bda06c5b6ba4c57 Mon Sep 17 00:00:00 2001
From: Dmitry Sivachenko <demon@FreeBSD.org>
Date: Wed, 2 Jul 2014 08:52:14 +0000
Subject: Both LOG_DIR and PID_DIR are created during package installation with
 correct permissions. Do not try to do the same every time daemon starts.

---
 devel/hadoop/files/datanode.in          | 12 ------------
 devel/hadoop/files/jobtracker.in        | 12 ------------
 devel/hadoop/files/namenode.in          | 12 ------------
 devel/hadoop/files/secondarynamenode.in | 12 ------------
 devel/hadoop/files/tasktracker.in       | 12 ------------
 5 files changed, 60 deletions(-)

(limited to 'devel/hadoop')

diff --git a/devel/hadoop/files/datanode.in b/devel/hadoop/files/datanode.in
index cee608a8faa5..040d4212fdbf 100644
--- a/devel/hadoop/files/datanode.in
+++ b/devel/hadoop/files/datanode.in
@@ -50,18 +50,6 @@ datanode_init()
 	do
 		. ${f}
 	done
-	if [ -n "${datanode_log_dir}" ]
-	then
-		HADOOP_LOG_DIR=${datanode_log_dir}
-	fi		
-
-	if [ -n "${datanode_pid_dir}" ]
-	then
-		HADOOP_LOG_DIR=${datanode_pid_dir}
-	fi		
-
-	install -d -m 755 -o ${datanode_user} -g ${datanode_group} ${HADOOP_PID_DIR}
-	install -d -m 755 -o ${datanode_user} -g ${datanode_group} ${HADOOP_LOG_DIR}
 }
 
 datanode_stop ()
diff --git a/devel/hadoop/files/jobtracker.in b/devel/hadoop/files/jobtracker.in
index 6a4ed3e5b227..a03a8e8d8f63 100644
--- a/devel/hadoop/files/jobtracker.in
+++ b/devel/hadoop/files/jobtracker.in
@@ -50,18 +50,6 @@ jobtracker_init()
 	do
 		. ${f}
 	done
-	if [ -n "${jobtracker_log_dir}" ]
-	then
-		HADOOP_LOG_DIR=${jobtracker_log_dir}
-	fi		
-
-	if [ -n "${jobtracker_pid_dir}" ]
-	then
-		HADOOP_LOG_DIR=${jobtracker_pid_dir}
-	fi		
-
-	install -d -m 755 -o ${jobtracker_user} -g ${jobtracker_group} ${HADOOP_PID_DIR}
-	install -d -m 755 -o ${jobtracker_user} -g ${jobtracker_group} ${HADOOP_LOG_DIR}
 }
 
 jobtracker_stop ()
diff --git a/devel/hadoop/files/namenode.in b/devel/hadoop/files/namenode.in
index 682c94998633..b924d2fa3606 100644
--- a/devel/hadoop/files/namenode.in
+++ b/devel/hadoop/files/namenode.in
@@ -50,18 +50,6 @@ namenode_init()
 	do
 		. ${f}
 	done
-	if [ -n "${namenode_log_dir}" ]
-	then
-		HADOOP_LOG_DIR=${namenode_log_dir}
-	fi		
-
-	if [ -n "${namenode_pid_dir}" ]
-	then
-		HADOOP_LOG_DIR=${namenode_pid_dir}
-	fi		
-
-	install -d -m 755 -o ${namenode_user} -g ${namenode_group} ${HADOOP_PID_DIR}
-	install -d -m 755 -o ${namenode_user} -g ${namenode_group} ${HADOOP_LOG_DIR}
 }
 
 namenode_stop ()
diff --git a/devel/hadoop/files/secondarynamenode.in b/devel/hadoop/files/secondarynamenode.in
index 4b09a97e0f10..e5e8d8df22ba 100644
--- a/devel/hadoop/files/secondarynamenode.in
+++ b/devel/hadoop/files/secondarynamenode.in
@@ -50,18 +50,6 @@ secondarynamenode_init()
 	do
 		. ${f}
 	done
-	if [ -n "${secondarynamenode_log_dir}" ]
-	then
-		HADOOP_LOG_DIR=${secondarynamenode_log_dir}
-	fi		
-
-	if [ -n "${secondarynamenode_pid_dir}" ]
-	then
-		HADOOP_LOG_DIR=${secondarynamenode_pid_dir}
-	fi		
-
-	install -d -m 755 -o ${secondarynamenode_user} -g ${secondarynamenode_group} ${HADOOP_PID_DIR}
-	install -d -m 755 -o ${secondarynamenode_user} -g ${secondarynamenode_group} ${HADOOP_LOG_DIR}
 }
 
 secondarynamenode_stop ()
diff --git a/devel/hadoop/files/tasktracker.in b/devel/hadoop/files/tasktracker.in
index ee99429f3698..07550c1c8d45 100644
--- a/devel/hadoop/files/tasktracker.in
+++ b/devel/hadoop/files/tasktracker.in
@@ -50,18 +50,6 @@ tasktracker_init()
 	do
 		. ${f}
 	done
-	if [ -n "${tasktracker_log_dir}" ]
-	then
-		HADOOP_LOG_DIR=${tasktracker_log_dir}
-	fi		
-
-	if [ -n "${tasktracker_pid_dir}" ]
-	then
-		HADOOP_LOG_DIR=${tasktracker_pid_dir}
-	fi		
-
-	install -d -m 755 -o ${tasktracker_user} -g ${tasktracker_group} ${HADOOP_PID_DIR}
-	install -d -m 755 -o ${tasktracker_user} -g ${tasktracker_group} ${HADOOP_LOG_DIR}
 }
 
 tasktracker_stop ()
-- 
cgit v1.2.3