aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Makonnen <mtm@FreeBSD.org>2007-10-25 18:10:05 +0000
committerMike Makonnen <mtm@FreeBSD.org>2007-10-25 18:10:05 +0000
commit99e95e553cc12b2c5f77b5e6c090185a4a4f0b51 (patch)
tree9da2208a02c9bd69d897473cde9eddfd3f3a1fc5
parent19de7d21cbd723353ba57b77d859882f2c31dac9 (diff)
downloadsrc-99e95e553cc12b2c5f77b5e6c090185a4a4f0b51.tar.gz
src-99e95e553cc12b2c5f77b5e6c090185a4a4f0b51.zip
Nuke rc.d/nfslocking which has been superceeded by rc.d/{lockd,statd}
Notes
Notes: svn path=/head/; revision=172983
-rw-r--r--ObsoleteFiles.inc2
-rwxr-xr-xetc/rc.d/Makefile2
-rwxr-xr-xetc/rc.d/nfslocking63
3 files changed, 3 insertions, 64 deletions
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 8a8708d44c8a..873b702f808d 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
#
+# 20071025: rc.d/nfslocking superceeded by rc.d/lockd and rc.d/statd
+OLD_FILES+=etc/rc.d/nfslocking
# 20070930: rename of cached to nscd
OLD_FILES+=etc/rc.d/cached
OLD_FILES+=usr/sbin/cached
diff --git a/etc/rc.d/Makefile b/etc/rc.d/Makefile
index 56aa59882ae5..99f8120928b3 100755
--- a/etc/rc.d/Makefile
+++ b/etc/rc.d/Makefile
@@ -25,7 +25,7 @@ FILES= DAEMON FILESYSTEMS LOGIN NETWORKING SERVERS \
mdconfig mdconfig2 mountd moused mroute6d mrouted msgs \
named natd netif netoptions \
network_ipv6 newsyslog nfsclient nfsd \
- nfslocking nfsserver nisdomain nsswitch ntpd ntpdate \
+ nfsserver nisdomain nsswitch ntpd ntpdate \
othermta \
pf pflog pfsync \
powerd power_profile ppp pppoed pwcheck \
diff --git a/etc/rc.d/nfslocking b/etc/rc.d/nfslocking
deleted file mode 100755
index e07d0a581b3d..000000000000
--- a/etc/rc.d/nfslocking
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: nfslocking,v 1.6 2002/03/24 15:52:41 lukem Exp $
-# $FreeBSD$
-#
-
-# PROVIDE: nfslocking
-# REQUIRE: nfsserver nfsclient nfsd rpcbind
-# BEFORE: DAEMON
-# KEYWORD: nojail nostart
-
-. /etc/rc.subr
-
-# Save the (one) commandline argument in case it gets clobbered.
-arg=$1
-
-# Either NFS client or server must be enabled and rpcbind(8) must be started.
-#
-nfslocking_precmd()
-{
- local ret
- ret=0
-
- if ! checkyesno nfs_server_enable && ! checkyesno nfs_client_enable
- then
- ret=1
- fi
- if ! checkyesno rpcbind_enable && \
- ! /etc/rc.d/rpcbind forcestatus 1>/dev/null 2>&1
- then
- force_depend rpcbind || ret=1
- fi
-
- if [ $name = "statd" ]
- then
- rc_flags=${rpc_statd_flags}
- elif [ $name = "lockd" ]
- then
- rc_flags=${rpc_lockd_flags}
- fi
-
- return ${ret}
-}
-
-start_precmd="nfslocking_precmd"
-stop_precmd='checkyesno nfs_server_enable || checkyesno nfs_client_enable'
-status_precmd=$stop_precmd
-
-# rpc.statd
-#
-name="statd"
-rcvar=rpc_statd_enable
-command="/usr/sbin/rpc.${name}"
-load_rc_config $name
-run_rc_command "$arg"
-
-# rpc.lockd
-#
-name="lockd"
-rcvar=rpc_lockd_enable
-command="/usr/sbin/rpc.${name}"
-load_rc_config $name
-run_rc_command "$arg"