talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Record rc.d/nfslocking dependency on rc.d/rpcbind. 

PR: conf/105465
Submitted By: ru (with minor cosmetic change)
MFC-After: 1 month
This commit is contained in:
Mike Makonnen 2007-03-30 19:08:58 +00:00
parent 58cf69a778
commit 624321b5a8
3 changed files with 54 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
etc/rc.d/lockd
View File

@ -5,7 +5,7 @@
#
# PROVIDE: nfslocking
# REQUIRE: nfsserver nfsclient nfsd
# REQUIRE: nfsserver nfsclient nfsd rpcbind
# BEFORE: DAEMON
# KEYWORD: nojail
@ -17,10 +17,24 @@ arg=$1
# Either NFS client or server must be enabled or this must be a 'forcestart'
# for either of the daemons to start.
#
start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
nfslocking_precmd()
{
if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable && \
[ -z "$rc_force" ]
then
return 1
fi
if ! checkyesno rpcbind_enable && \
! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
then
force_depend rpcbind || return 1
fi
}
start_precmd="nfslocking_precmd"
stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
[ -n "$rc_force" ]'
stop_precmd=$start_precmd
status_precmd=$start_precmd
status_precmd=$stop_precmd
# rpc.statd
#

22
etc/rc.d/nfslocking
View File

@ -5,7 +5,7 @@
#
# PROVIDE: nfslocking
# REQUIRE: nfsserver nfsclient nfsd
# REQUIRE: nfsserver nfsclient nfsd rpcbind
# BEFORE: DAEMON
# KEYWORD: nojail
@ -17,10 +17,24 @@ arg=$1
# Either NFS client or server must be enabled or this must be a 'forcestart'
# for either of the daemons to start.
#
start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
nfslocking_precmd()
{
if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable && \
[ -z "$rc_force" ]
then
return 1
fi
if ! checkyesno rpcbind_enable && \
! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
then
force_depend rpcbind || return 1
fi
}
start_precmd="nfslocking_precmd"
stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
[ -n "$rc_force" ]'
stop_precmd=$start_precmd
status_precmd=$start_precmd
status_precmd=$stop_precmd
# rpc.statd
#

22
etc/rc.d/statd
View File

@ -5,7 +5,7 @@
#
# PROVIDE: nfslocking
# REQUIRE: nfsserver nfsclient nfsd
# REQUIRE: nfsserver nfsclient nfsd rpcbind
# BEFORE: DAEMON
# KEYWORD: nojail
@ -17,10 +17,24 @@ arg=$1
# Either NFS client or server must be enabled or this must be a 'forcestart'
# for either of the daemons to start.
#
start_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
nfslocking_precmd()
{
if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable && \
[ -z "$rc_force" ]
then
return 1
fi
if ! checkyesno rpcbind_enable && \
! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
then
force_depend rpcbind || return 1
fi
}
start_precmd="nfslocking_precmd"
stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable ||
[ -n "$rc_force" ]'
stop_precmd=$start_precmd
status_precmd=$start_precmd
status_precmd=$stop_precmd
# rpc.statd
#