diff options
author | dougb <dougb@FreeBSD.org> | 2002-06-21 19:50:01 +0000 |
---|---|---|
committer | dougb <dougb@FreeBSD.org> | 2002-06-21 19:50:01 +0000 |
commit | a27bc1f2cf4ac3958a70ed19346f19627c2fa983 (patch) | |
tree | fc1a70ccf05ba20f51d9fda8bffc6142ca7368a1 /etc | |
parent | 38d6ab03fa6aaf7647cecabd364e9aaa07205359 (diff) | |
download | FreeBSD-src-a27bc1f2cf4ac3958a70ed19346f19627c2fa983.zip FreeBSD-src-a27bc1f2cf4ac3958a70ed19346f19627c2fa983.tar.gz |
Hone the rpcbind dependency checking.
Submitted by: Mike Makonnen <makonnen@pacbell.net>
Diffstat (limited to 'etc')
-rwxr-xr-x | etc/rc.d/amd | 4 | ||||
-rwxr-xr-x | etc/rc.d/mountd | 2 | ||||
-rwxr-xr-x | 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 882f265..ca4a606 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 612365f..0e56995 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 fd923df..191d6de 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) |