d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

My forced commit to note the repo-copy (naturally) changed the $FreeBSD$ keyword line,

Browse Source 
so that when I applied the patch to my check-in tree the top half of my patch failed to
apply.  Off course I saw what I *expected* to see (the bottom half succeeded) and
didn't notice that it had failed to apply cleanly.

Approved by: re (bmah)
This commit is contained in:
mtm 2007-08-18 04:08:53 +00:00
parent 2318249476
commit 5c65a0ed5e
2 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
etc/rc.d/lockd
View File

@ -1,22 +1,28 @@
#!/bin/sh #!/bin/sh
# #
# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm
# $FreeBSD$ # $FreeBSD$
# #
# PROVIDE: nfslocking # PROVIDE: lockd
# REQUIRE: nfsserver nfsclient nfsd rpcbind # REQUIRE: nfsserver nfsclient nfsd rpcbind
# BEFORE: DAEMON # BEFORE: DAEMON
# KEYWORD: nojail # KEYWORD: nojail
. /etc/rc.subr . /etc/rc.subr
# Save the (one) commandline argument in case it gets clobbered. name="lockd"
arg=$1 rcvar=rpc_lockd_enable
command="/usr/sbin/rpc.${name}"
start_precmd='lockd_precmd'
stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
status_precmd=$stop_precmd
# Either NFS client or server must be enabled and rpcbind(8) must be started. # Make sure that we are either an NFS client or server, and that we get
# the correct flags from rc.conf(5).
# #
nfslocking_precmd() lockd_precmd()
{ {
local ret local ret
ret=0 ret=0

16
etc/rc.d/statd
View File

@ -1,22 +1,28 @@
#!/bin/sh #!/bin/sh
# #
# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $ # $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
# FreeBSD History: src/etc/rc.d/nfslocking,v 1.11 2004/10/07 13:55:26 mtm Exp
# $FreeBSD$ # $FreeBSD$
# #
# PROVIDE: nfslocking # PROVIDE: statd
# REQUIRE: nfsserver nfsclient nfsd rpcbind # REQUIRE: nfsserver nfsclient nfsd rpcbind
# BEFORE: DAEMON # BEFORE: DAEMON
# KEYWORD: nojail # KEYWORD: nojail
. /etc/rc.subr . /etc/rc.subr
# Save the (one) commandline argument in case it gets clobbered. name="statd"
arg=$1 rcvar=rpc_statd_enable
command="/usr/sbin/rpc.${name}"
start_precmd='statd_precmd'
stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
status_precmd=$stop_precmd
# Either NFS client or server must be enabled and rpcbind(8) must be started. # Make sure that we are either an NFS client or server, and that we get
# the correct flags from rc.conf(5).
# #
nfslocking_precmd() statd_precmd()
{ {
local ret local ret
ret=0 ret=0