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

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:
Mike Makonnen 2007-08-18 04:08:53 +00:00
parent eb2e7f82ff
commit 33eba7d495
2 changed files with 22 additions and 10 deletions

View File

@ -1,22 +1,28 @@
#!/bin/sh
#
# $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$
#
# PROVIDE: nfslocking
# PROVIDE: lockd
# REQUIRE: nfsserver nfsclient nfsd rpcbind
# BEFORE: DAEMON
# KEYWORD: nojail
. /etc/rc.subr
# Save the (one) commandline argument in case it gets clobbered.
arg=$1
name="lockd"
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
ret=0

View File

@ -1,22 +1,28 @@
#!/bin/sh
#
# $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$
#
# PROVIDE: nfslocking
# PROVIDE: statd
# REQUIRE: nfsserver nfsclient nfsd rpcbind
# BEFORE: DAEMON
# KEYWORD: nojail
. /etc/rc.subr
# Save the (one) commandline argument in case it gets clobbered.
arg=$1
name="statd"
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
ret=0