diff options
| author | mtm <mtm@FreeBSD.org> | 2007-08-18 04:08:53 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2007-08-18 04:08:53 +0000 |
| commit | 5c65a0ed5e126502a724f48781b78650071e3c2b (patch) | |
| tree | 2b833dd6157f62d87bc68401cf6462846294a89a /etc | |
| parent | 2318249476e9fc756b110a40744262f680d9761e (diff) | |
| download | FreeBSD-src-5c65a0ed5e126502a724f48781b78650071e3c2b.zip FreeBSD-src-5c65a0ed5e126502a724f48781b78650071e3c2b.tar.gz | |
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)
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/rc.d/lockd | 16 | ||||
| -rw-r--r-- | etc/rc.d/statd | 16 |
2 files changed, 22 insertions, 10 deletions
diff --git a/etc/rc.d/lockd b/etc/rc.d/lockd index 9aa9d7f..13a9891 100644 --- a/etc/rc.d/lockd +++ b/etc/rc.d/lockd @@ -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 diff --git a/etc/rc.d/statd b/etc/rc.d/statd index fd2a78a..aaf8bb4 100644 --- a/etc/rc.d/statd +++ b/etc/rc.d/statd @@ -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 |
