Index: head/devel/hadoop2/files/datanode.in
===================================================================
--- head/devel/hadoop2/files/datanode.in	(revision 414110)
+++ head/devel/hadoop2/files/datanode.in	(revision 414111)
@@ -1,41 +1,47 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: datanode
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # datanode_enable (bool):        Set to NO by default.
 #                                Set it to YES to enable datanode.
 
 . /etc/rc.subr
 
 export PATH=${PATH}:%%LOCALBASE%%/bin
 name=datanode
 rcvar=datanode_enable
 pidfile=%%HADOOP_RUNDIR%%/hadoop-%%HDFS_USER%%-${name}.pid
 
 load_rc_config "${name}"
 
 : ${datanode_enable:=NO}
 : ${datanode_user:=%%HDFS_USER%%}
 
 command="%%PREFIX%%/sbin/hadoop-daemon.sh"
+command_interpreter_execution="%%JAVA_HOME%%/bin/java"
 command_args='--config %%ETCDIR%% start datanode'
 
 start_postcmd="start_postcmd"
 stop_cmd=datanode_stop
+status_precmd=find_pid
 
 start_postcmd () {
   rc_pid=$(check_pidfile ${pidfile} %%JAVA_HOME%%/bin/java)
   if [ -n "$rc_pid" ]; then
     protect -p $rc_pid
   fi
 }
 
 datanode_stop () {
   su -m ${datanode_user} -c "${command} --config %%ETCDIR%% stop datanode"
+}
+
+find_pid () {
+  rc_pid=$(check_pidfile $pidfile $command_interpreter_execution)
 }
 
 run_rc_command "$1"
Index: head/devel/hadoop2/files/journalnode.in
===================================================================
--- head/devel/hadoop2/files/journalnode.in	(revision 414110)
+++ head/devel/hadoop2/files/journalnode.in	(revision 414111)
@@ -1,32 +1,38 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: journalnode
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # journalnode_enable (bool):     Set to NO by default.
 #                                Set it to YES to enable journalnode.
 
 . /etc/rc.subr
 
 export PATH=${PATH}:%%LOCALBASE%%/bin
 name=journalnode
 rcvar=journalnode_enable
 
 load_rc_config "${name}"
 
 : ${journalnode_enable:=NO}
 : ${journalnode_user:=%%HDFS_USER%%}
 
 command="%%PREFIX%%/sbin/hadoop-daemon.sh"
+command_interpreter_execution="%%JAVA_HOME%%/bin/java"
 command_args='--config %%ETCDIR%% start journalnode'
 
 stop_cmd=journalnode_stop
+status_precmd=find_pid
 
 journalnode_stop () {
   su -m ${journalnode_user} -c "${command} --config %%ETCDIR%% stop journalnode"
+}
+
+find_pid () {
+  rc_pid=$(check_pidfile $pidfile $command_interpreter_execution)
 }
 
 run_rc_command "$1"
Index: head/devel/hadoop2/files/namenode.in
===================================================================
--- head/devel/hadoop2/files/namenode.in	(revision 414110)
+++ head/devel/hadoop2/files/namenode.in	(revision 414111)
@@ -1,32 +1,38 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: namenode
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # namenode_enable (bool):        Set to NO by default.
 #                                Set it to YES to enable namenode.
 
 . /etc/rc.subr
 
 export PATH=${PATH}:%%LOCALBASE%%/bin
 name=namenode
 rcvar=namenode_enable
 
 load_rc_config "${name}"
 
 : ${namenode_enable:=NO}
 : ${namenode_user:=%%HDFS_USER%%}
 
 command="%%PREFIX%%/sbin/hadoop-daemon.sh"
+command_interpreter_execution="%%JAVA_HOME%%/bin/java"
 command_args='--config %%ETCDIR%% start namenode'
 
 stop_cmd=namenode_stop
+status_precmd=find_pid
 
 namenode_stop () {
   su -m ${namenode_user} -c "${command} --config %%ETCDIR%% stop namenode"
+}
+
+find_pid () {
+  rc_pid=$(check_pidfile $pidfile $command_interpreter_execution)
 }
 
 run_rc_command "$1"
Index: head/devel/hadoop2/files/nodemanager.in
===================================================================
--- head/devel/hadoop2/files/nodemanager.in	(revision 414110)
+++ head/devel/hadoop2/files/nodemanager.in	(revision 414111)
@@ -1,41 +1,47 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: nodemanager
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # nodemanager_enable (bool):        Set to NO by default.
 #                                   Set it to YES to enable resourcemanager.
 
 . /etc/rc.subr
 
 export PATH=${PATH}:%%LOCALBASE%%/bin
 name=nodemanager
 rcvar=nodemanager_enable
 pidfile=%%HADOOP_RUNDIR%%/yarn-yarn-${name}.pid
 
 load_rc_config "${name}"
 
 : ${nodemanager_enable:=NO}
 : ${nodemanager_user:=%%MAPRED_USER%%}
 
 command="%%PREFIX%%/sbin/yarn-daemon.sh"
+command_interpreter_execution="%%JAVA_HOME%%/bin/java"
 command_args='--config %%ETCDIR%% start nodemanager'
 
 start_postcmd="start_postcmd"
 stop_cmd=nodemanager_stop
+status_precmd=find_pid
 
 start_postcmd () {
   rc_pid=$(check_pidfile ${pidfile} %%JAVA_HOME%%/bin/java)
   if [ -n "$rc_pid" ]; then
     protect -p $rc_pid
   fi
 }
 
 nodemanager_stop () {
   su -m ${nodemanager_user} -c "${command} --config %%ETCDIR%% stop nodemanager"
+}
+
+find_pid () {
+  rc_pid=$(check_pidfile $pidfile $command_interpreter_execution)
 }
 
 run_rc_command "$1"
Index: head/devel/hadoop2/files/resourcemanager.in
===================================================================
--- head/devel/hadoop2/files/resourcemanager.in	(revision 414110)
+++ head/devel/hadoop2/files/resourcemanager.in	(revision 414111)
@@ -1,32 +1,39 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: resourcemanager
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # resourcemanager_enable (bool):        Set to NO by default.
 #                                       Set it to YES to enable resourcemanager.
 
 . /etc/rc.subr
 
 export PATH=${PATH}:%%LOCALBASE%%/bin
 name=resourcemanager
 rcvar=resourcemanager_enable
 
 load_rc_config "${name}"
 
 : ${resourcemanager_enable:=NO}
 : ${resourcemanager_user:=%%MAPRED_USER%%}
 
 command="%%PREFIX%%/sbin/yarn-daemon.sh"
+command_interpreter_execution="%%JAVA_HOME%%/bin/java"
 command_args='--config %%ETCDIR%% start resourcemanager'
 
 stop_cmd=resourcemanager_stop
+start_postcmd="start_postcmd"
+status_precmd=find_pid
 
 resourcemanager_stop () {
   su -m ${resourcemanager_user} -c "${command} --config %%ETCDIR%% stop resourcemanager"
+}
+
+find_pid () {
+  rc_pid=$(check_pidfile $pidfile $command_interpreter_execution)
 }
 
 run_rc_command "$1"
Index: head/devel/hadoop2/files/zkfc.in
===================================================================
--- head/devel/hadoop2/files/zkfc.in	(revision 414110)
+++ head/devel/hadoop2/files/zkfc.in	(revision 414111)
@@ -1,32 +1,38 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 # PROVIDE: zkfc
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 #
 # zkfc_enable (bool):            Set to NO by default.
 #                                Set it to YES to enable zkfc.
 
 . /etc/rc.subr
 
 export PATH=${PATH}:%%LOCALBASE%%/bin
 name=zkfc
 rcvar=zkfc_enable
 
 load_rc_config "${name}"
 
 : ${zkfc_enable:=NO}
 : ${zkfc_user:=%%HDFS_USER%%}
 
 command="%%PREFIX%%/sbin/hadoop-daemon.sh"
+command_interpreter_execution="%%JAVA_HOME%%/bin/java"
 command_args='--config %%ETCDIR%% start zkfc'
 
 stop_cmd=zkfc_stop
+status_precmd=find_pid
 
 zkfc_stop () {
   su -m ${zkfc_user} -c "${command} --config %%ETCDIR%% stop zkfc"
+}
+
+find_pid () {
+  rc_pid=$(check_pidfile $pidfile $command_interpreter_execution)
 }
 
 run_rc_command "$1"