[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd rpc.gssd.initd rpc.svcgssd.initd

[Mike Frysinger (vapier)]

vapier      08/04/20 00:52:25

  Modified:             nfs.initd rpc.gssd.initd
  Added:                rpc.svcgssd.initd
  Log:
  Split the gssd and svcgssd init.d scripts #186037 by Paul B. Henson.
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.12                 net-fs/nfs-utils/files/nfs.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.11&r2=1.12

Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nfs.initd	4 Feb 2008 22:23:24 -0000	1.11
+++ nfs.initd	20 Apr 2008 00:52:24 -0000	1.12
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.11 2008/02/04 22:23:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.12 2008/04/20 00:52:24 vapier Exp $
 
 opts="reload"
 
@@ -19,12 +19,12 @@
 	local myneed=""
 	if [ -e /etc/exports ] ; then
 		if awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { exit 0 } END { exit 1 }' /etc/exports ; then
-			myneed="${myneed} rpc.gssd"
+			myneed="${myneed} rpc.svcgssd"
 		fi
 	fi
 	type -t config 2>/dev/null 1>&2 && config /etc/exports
 	need portmap rpc.statd ${myneed}
-	use ypbind net dns rpc.rquotad rpc.idmapd rpc.gssd
+	use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
 	after quota
 }
 



1.7                  net-fs/nfs-utils/files/rpc.gssd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd?rev=1.7&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd?rev=1.7&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd?r1=1.6&r2=1.7

Index: rpc.gssd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpc.gssd.initd	4 Feb 2008 22:23:24 -0000	1.6
+++ rpc.gssd.initd	20 Apr 2008 00:52:24 -0000	1.7
@@ -1,13 +1,10 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.6 2008/02/04 22:23:24 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.7 2008/04/20 00:52:24 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
-   gssd=/usr/sbin/rpc.gssd
-svcgssd=/usr/sbin/rpc.svcgssd
-
 depend() {
 	use ypbind net
 	need portmap
@@ -25,31 +22,16 @@
 	fi
 }
 
-start_it() {
-	ebegin "Starting $1"
-	shift
-	"$@"
-	eend $?
-	ret=$((ret + $?))
-}
 start() {
 	mount_pipefs
 
-	local ret=0
-	start_it gssd ${gssd} ${OPTS_RPC_GSSD}
-	start_it svcgssd ${svcgssd} ${OPTS_RPC_SVCGSSD}
-	return ${ret}
-}
-
-stop_it() {
-	ebegin "Stopping $1"
-	start-stop-daemon --stop --exec $2
+	ebegin "Starting gssd"
+	start-stop-daemon --stop --exec /usr/sbin/rpc.gssd ${OPTS_RPC_GSSD}
 	eend $?
-	ret=$((ret + $?))
 }
+
 stop() {
-	local ret=0
-	stop_it gssd ${gssd}
-	stop_it svcgssd ${svcgssd}
-	return ${ret}
+	ebegin "Stopping gssd"
+	start-stop-daemon --stop --exec /usr/sbin/rpc.gssd
+	eend $?
 }



1.1                  net-fs/nfs-utils/files/rpc.svcgssd.initd

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd?rev=1.1&content-type=text/plain

Index: rpc.svcgssd.initd
===================================================================
#!/sbin/runscript
# Copyright 1999-2008 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.1 2008/04/20 00:52:24 vapier Exp $

[ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs

depend() {
	use ypbind net
	need portmap
	after quota
}

mount_pipefs() {
	if grep -qs rpc_pipefs /proc/filesystems ; then
		if ! grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts ; then
			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
}

start() {
	mount_pipefs

	ebegin "Starting svcgssd"
	start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd ${OPTS_RPC_SVCGSSD}
	eend $?
}

stop() {
	ebegin "Stopping svcgssd"
	start-stop-daemon --stop --exec /usr/sbin/rpc.svcgssd
	eend $?
}



-- 
gentoo-commits@l.g.o mailing list