[gentoo-commits] gentoo-x86 commit in sys-freebsd/freebsd-usbin/files: rpc.lockd.initd nfs.initd rpc.statd.initd freebsd-usbin-7.0-nowrap.patch nfs.confd

[Javier Villavicencio (the_paya)]

the_paya    09/01/22 21:06:27

  Modified:             nfs.initd nfs.confd
  Added:                rpc.lockd.initd rpc.statd.initd
                        freebsd-usbin-7.0-nowrap.patch
  Log:
  Import of the 7.1 ebuilds from gentoo-bsd overlay.
  (Portage version: 2.2_rc23/cvs/FreeBSD i386)

Revision  Changes    Path
1.3                  sys-freebsd/freebsd-usbin/files/nfs.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd?r1=1.2&r2=1.3

Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nfs.initd	6 Apr 2007 14:47:17 -0000	1.2
+++ nfs.initd	22 Jan 2009 21:06:27 -0000	1.3
@@ -1,209 +1,54 @@
 #!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.initd,v 1.2 2007/04/06 14:47:17 uberlord Exp $
 
 #---------------------------------------------------------------------------
-# This script starts/stops the following
-#	rpc.statd if necessary (also checked by init.d/nfsmount)
-#	rpc.rquotad if exists (from quota package)
-#	rpc.nfsd
-#	rpc.mountd
+# This script starts/stops nfsd and mountd
+# Daemons rpc.rquotad, rpc.rstatd, rpc.rusersd, rpc.rwalld and rpc.sprayd
+# should be started from inetd on FreeBSD.
 #---------------------------------------------------------------------------
 
-# NB: Config is in /etc/conf.d/nfs
-
 opts="reload"
 
-# This variable is used for controlling whether or not to run exportfs -ua;
-# see stop() for more information
-restarting=no
-
 # The binary locations
-exportfs=/usr/sbin/exportfs
-statd=/usr/sbin/rpc.statd
-idmapd=/usr/sbin/rpc.idmapd
-rquotad=/usr/sbin/rpc.rquotad
-nfsd=/usr/sbin/rpc.nfsd
-mountd=/usr/sbin/rpc.mountd
+nfsd=/usr/sbin/nfsd
+mountd=/usr/sbin/mountd
 
 depend() {
-	use ypbind net
+	use ypbind net rpc.lockd
 	need rpcbind
 	after quota
 }
 
-start_idmapd() {
-	[ ! -x "${idmapd}" ] && return 0
-
-	if grep -q rpc_pipefs /proc/filesystems ; then
-		if ! grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-			[ ! -d /var/lib/nfs/rpc_pipefs ] && mkdir -p /var/lib/nfs/rpc_pipefs
-			ebegin "Mounting RPC pipefs"
-			mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-			eend $?
-		fi
-	fi
-
-	ebegin "Starting idmapd"
-	${idmapd} ${RPCIDMAPDOPTS}
-	eend $?
-}
-
-stop_idmapd() {
-	[ ! -x ${idmapd} ] && return 0
-
-	ebegin "Stopping idmapd"
-	start-stop-daemon --stop --quiet --exec ${idmapd}
-	ret=$?
-	eend ${ret}
-
-	if [ $restarting = "no" -a "${RC_CMD}" != "restart" ] ; then
-		if grep -q "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
-			ebegin "Unmounting RPC pipefs"
-			umount /var/lib/nfs/rpc_pipefs
-			eend $?
-		fi
-	fi
-
-	return ${ret}
-}
-
-start_statd() {
-	# Don't start rpc.statd if already started by init.d/nfsmount
-	killall -0 rpc.statd 2>/dev/null && return 0
-	ebegin "Starting NFS statd"
-	start-stop-daemon --start --quiet --exec \
-		$statd -- $RPCSTATDOPTS 1>&2
-	eend $? "Error starting NFS statd"
-}
-
-stop_statd() {
-	# Don't stop rpc.statd if it's in use by init.d/nfsmount.
-	mount -t nfs | grep -q . && return 0
-	# Make sure it's actually running
-	killall -0 rpc.statd 2>/dev/null || return 0
-	# Okay, all tests passed, stop rpc.statd
-	ebegin "Stopping NFS statd"
-	start-stop-daemon --stop --quiet --exec $statd 1>&2
-	eend $? "Error stopping NFS statd"
-}
-
-waitfor_exportfs() {
-	local pid=$1
-	( sleep ${EXPORTFSTIMEOUT:-30}; kill -9 $pid 2>/dev/null ) &
-	wait $1
-}
-
 start() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] ; then
-		modprobe nfsd &> /dev/null
-	fi
-
-	# This is the new "kernel 2.6 way" to handle the exports file
-	if grep -q nfsd /proc/filesystems 2>/dev/null; then
-		if ! grep -q "nfsd /proc/fs/nfs" /proc/mounts 2>/dev/null; then
-			ebegin "Mounting nfsd filesystem in /proc"
-			mount -t nfsd nfsd /proc/fs/nfs
-			eend $? "Error mounting nfsd filesystem in /proc"
-		fi
-	fi
-	# now that nfsd is mounted inside /proc, we can safely start mountd later
-
-	start_idmapd
-	start_statd
-
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
-	if grep -q '^/' /etc/exports 2>/dev/null; then
-		ebegin "Exporting NFS directories"
-		$exportfs -r 1>&2 &
-		waitfor_exportfs $!
-		eend $? "Error exporting NFS directories"
-	fi
-
-	if [ -x "${rquotad}" ]; then
-		ebegin "Starting NFS rquotad"
-		start-stop-daemon --start --quiet --exec \
-			$rquotad -- $RPCRQUOTADOPTS 1>&2
-		eend $? "Error starting NFS rquotad"
-	fi
-
 	ebegin "Starting NFS daemon"
 	start-stop-daemon --start --quiet --exec \
-		$nfsd -- $RPCNFSDCOUNT 1>&2
+		$nfsd -- ${nfsdopts}
 	eend $? "Error starting NFS daemon"
 
 	# Start mountd
 	ebegin "Starting NFS mountd"
 	start-stop-daemon --start --quiet --exec \
-		$mountd -- $RPCMOUNTDOPTS 1>&2
+		$mountd -- ${mountdopts} ${exporstfile}
 	eend $? "Error starting NFS mountd"
 }
 
 stop() {
-	# Don't check NFSSERVER variable since it might have changed,
-	# instead use --oknodo to smooth things over
 	ebegin "Stopping NFS mountd"
-	start-stop-daemon --stop --quiet --oknodo \
-		--exec $mountd 1>&2
+	start-stop-daemon --stop --quiet --oknodo --exec $mountd \
+		--pidfile /var/run/mountd.pid
 	eend $? "Error stopping NFS mountd"
 
-	# nfsd sets its process name to [nfsd] so don't look for $nfsd
 	ebegin "Stopping NFS daemon"
 	start-stop-daemon --stop --quiet --oknodo \
-		--name nfsd --user root --signal 2 1>&2
+		--name nfsd --user root
 	eend $? "Error stopping NFS daemon"
-
-	if [ -x $rquotad ]; then
-		ebegin "Stopping NFS rquotad"
-		start-stop-daemon --stop --quiet --oknodo \
-			--exec $rquotad 1>&2
-		eend $? "Error stopping NFS rquotad"
-	fi
-
-	# When restarting the NFS server, running "exportfs -ua" probably
-	# isn't what the user wants.  Running it causes all entries listed
-	# in xtab to be removed from the kernel export tables, and the
-	# xtab file is cleared. This effectively shuts down all NFS
-	# activity, leaving all clients holding stale NFS filehandles,
-	# *even* when the NFS server has restarted.
-	#
-	# That's what you would want if you were shutting down the NFS
-	# server for good, or for a long period of time, but not when the
-	# NFS server will be running again in short order.  In this case,
-	# then "exportfs -r" will reread the xtab, and all the current
-	# clients will be able to resume NFS activity, *without* needing
-	# to umount/(re)mount the filesystem.
-	if [ "$restarting" = no -a "${RC_CMD}" != "restart" ]; then
-		ebegin "Unexporting NFS directories"
-		# Exportfs likes to hang if networking isn't working.
-		# If that's the case, then try to kill it so the
-		# shutdown process can continue.
-		$exportfs -ua 1>&2 &
-		waitfor_exportfs $!
-		eend $? "Error unexporting NFS directories"
-	fi
-
-	stop_statd
-	stop_idmapd
 }
 
 reload() {
-	# Exportfs likes to hang if networking isn't working.
-	# If that's the case, then try to kill it so the
-	# bootup process can continue.
+	# Hangup signal to mountd reloads /etc/exports.
 	ebegin "Reloading /etc/exports"
-	$exportfs -r 1>&2 &
-	waitfor_exportfs $!
-	eend $? "Error exporting NFS directories"
-}
-
-restart() {
-	# See long comment in stop() regarding "restarting" and exportfs -ua
-	restarting=yes
-	svc_stop
-	svc_start
+	start-stop-daemon --signal 1 --quiet --exec $mountd \
+		--pidfile /var/run/mountd.pid
+	eend $?
 }



1.2                  sys-freebsd/freebsd-usbin/files/nfs.confd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.confd?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.confd?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.confd?r1=1.1&r2=1.2

Index: nfs.confd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.confd,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nfs.confd	1 Apr 2006 16:43:51 -0000	1.1
+++ nfs.confd	22 Jan 2009 21:06:27 -0000	1.2
@@ -1,24 +1,10 @@
-# /etc/conf.d/nfs
-# $Header: /var/cvsroot/gentoo-x86/sys-freebsd/freebsd-usbin/files/nfs.confd,v 1.1 2006/04/01 16:43:51 flameeyes Exp $
-
 # Config file for /etc/init.d/nfs
-
-# If you wish to set the port numbers for lockd,
-# please see /etc/sysctl.conf
-
-# Number of servers to be started up by default
-RPCNFSDCOUNT=8
-
-# Options to pass to rpc.mountd
-# ex. RPCMOUNTDOPTS="-p 32767
-RPCMOUNTDOPTS=""
-
-# Options to pass to rpc.statd
-# ex. RPCSTATDOPTS="-p 32765 -o 32766"
-RPCSTATDOPTS=""
-
-# Options to pass to rpc.idmapd
-RPCIDMAPDOPTS=""
-
-# Timeout (in seconds) for exportfs
-EXPORTFSTIMEOUT=30
+# Options for nfsd (see man nfsd)
+# Example: 8 nfsd servers started:
+#nfsdopts="-n 8"
+
+# Options for mountd (see man mountd)
+# Example: allow non-root users to mount shares:
+#mountdopts="-n"
+# Specify t he exports file, this is the default:
+#exportsfile="/etc/exports"



1.1                  sys-freebsd/freebsd-usbin/files/rpc.lockd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/rpc.lockd.initd?rev=1.1&content-type=text/plain

Index: rpc.lockd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

depend() {
        need net rpcbind rpc.statd
}

start() {
        ebegin "Starting NFS lockd"
        start-stop-daemon --start --quiet --exec \
                /usr/sbin/rpc.lockd -- $rpclockdopts
        eend $? "Error starting NFS lockd"
}

stop() {
        ebegin "Stopping NFS lockd"
        start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.lockd
        eend $? "Error stopping NFS lockd"
}



1.1                  sys-freebsd/freebsd-usbin/files/rpc.statd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/rpc.statd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/rpc.statd.initd?rev=1.1&content-type=text/plain

Index: rpc.statd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2

depend() {
        need net rpcbind
}

start() {
        ebegin "Starting NFS statd"
        start-stop-daemon --start --quiet --exec \
                /usr/sbin/rpc.statd -- $rpcstatdopts
        eend $? "Error starting NFS statd"
}

stop() {
        ebegin "Stopping NFS statd"
        start-stop-daemon --stop --quiet --exec /usr/sbin/rpc.statd
        eend $? "Error stopping NFS statd"
}



1.1                  sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-freebsd/freebsd-usbin/files/freebsd-usbin-7.0-nowrap.patch?rev=1.1&content-type=text/plain

Index: freebsd-usbin-7.0-nowrap.patch
===================================================================
diff -ur usr.sbin.orig/rpcbind/Makefile usr.sbin/rpcbind/Makefile
--- usr.sbin.orig/rpcbind/Makefile	2007-04-21 12:02:30 +0000
+++ usr.sbin/rpcbind/Makefile	2007-04-21 12:05:32 +0000
@@ -8,13 +8,20 @@
 SRCS=	check_bound.c rpcb_stat.c rpcb_svc_4.c rpcbind.c pmap_svc.c \
 	rpcb_svc.c rpcb_svc_com.c security.c warmstart.c util.c
 
-CFLAGS+= -DPORTMAP -DLIBWRAP
+CFLAGS+= -DPORTMAP
 
 .if ${MK_INET6_SUPPORT} != "no"
 CFLAGS+= -DINET6
 .endif
 
-DPADD=	${LIBWRAP} ${LIBUTIL}
-LDADD=	-lwrap -lutil
+DPADD=	${LIBUTIL}
+LDADD=	-lutil
+
+.if !defined(NO_WRAP)
+CFLAGS+= -DTCP_WRAPPER
+DPADD+=         ${LIBWRAP}
+LDADD+=         -lwrap
+.endif
+
 
 .include <bsd.prog.mk>
diff -ur usr.sbin.orig/ypserv/Makefile usr.sbin/ypserv/Makefile
--- usr.sbin.orig/ypserv/Makefile	2007-04-21 12:02:31 +0000
+++ usr.sbin/ypserv/Makefile	2007-04-21 12:06:53 +0000
@@ -8,10 +8,13 @@
 SRCS=	yp_svc.c yp_server.c yp_dblookup.c yp_dnslookup.c \
 	ypxfr_clnt.c yp.h yp_main.c yp_error.c yp_access.c yp_svc_udp.c
 
-CFLAGS+= -DDB_CACHE -DTCP_WRAPPER -I.
+CFLAGS+= -DDB_CACHE -I.
 
+.if !defined(NO_WRAP)
+CFLAGS+= -DTCP_WRAPPER
 DPADD=	${LIBWRAP}
 LDADD=	-lwrap
+.endif
 
 CLEANFILES= yp_svc.c ypxfr_clnt.c yp.h