From 032c8774fa57acab2f1ec063a9be87fdcde03a6d Mon Sep 17 00:00:00 2001
From: Doug Barton <dougb@FreeBSD.org>
Date: Fri, 21 Jun 2002 19:50:01 +0000
Subject: [PATCH] Hone the rpcbind dependency checking.

Submitted by:	Mike Makonnen <makonnen@pacbell.net>
---
 etc/rc.d/amd     | 4 ++--
 etc/rc.d/mountd  | 2 +-
 etc/rc.d/rpcbind | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index 882f2650fdd3..ca4a6063a296 100755
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@@ -13,6 +13,7 @@
 
 name="amd"
 rcvar=`set_rcvar`
+command="/usr/sbin/${name}"
 
 case `${CMD_OSTYPE}` in
 FreeBSD)
@@ -24,7 +25,6 @@ NetBSD)
 	required_dirs="$amd_dir"
 	required_files="/etc/amd.conf"
 	required_vars="rpcbind"
-	command="/usr/sbin/${name}"
 	;;
 esac
 
@@ -37,7 +37,7 @@ amd_precmd()
 		fi
 
 		if ! checkyesno portmap_enable  && \
-		   [ -z "`check_process ${portmap_program}`" ]
+		    ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
                 then
 			force_depend rpcbind || return 1
 		fi
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd
index 612365fba83b..0e569954c08c 100755
--- a/etc/rc.d/mountd
+++ b/etc/rc.d/mountd
@@ -35,7 +35,7 @@ mountd_precmd()
 		fi
 
 		if ! checkyesno portmap_enable  && \
-		   [ -z "`check_process ${portmap_program}`" ]
+		    ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
                 then
 			force_depend rpcbind || return 1
 		fi
diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind
index fd923df9ff27..191d6deba277 100755
--- a/etc/rc.d/rpcbind
+++ b/etc/rc.d/rpcbind
@@ -17,12 +17,12 @@ name="rpcbind"
 #	subroutines in rc.subr won't catch it.
 #
 load_rc_config $name
-command="${portmap_program:-/usr/sbin/${name}}"
 
 case `${CMD_OSTYPE}` in
 FreeBSD)
 	pidfile=
 	rcvar="portmap_enable"
+	command="${portmap_program:-/usr/sbin/${name}}"
 	eval ${name}_flags=\"${portmap_flags}\"
 	;;
 NetBSD)