Split the gssd and svcgssd init.d scripts #186037 by Paul B. Henson.

(Portage version: 2.2_pre5)

7 files changed, 62 insertions, 37 deletions

diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index fed52276c298..12a36a7b599d 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-fs/nfs-utils
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.120 2008/04/20 00:39:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.121 2008/04/20 00:52:23 vapier Exp $
+
+  20 Apr 2008; Mike Frysinger <vapier@gentoo.org> files/nfs.initd,
+  files/rpc.gssd.initd, +files/rpc.svcgssd.initd,
+  nfs-utils-1.0.12-r5.ebuild, nfs-utils-1.1.0-r1.ebuild,
+  nfs-utils-1.1.1.ebuild:
+  Split the gssd and svcgssd init.d scripts #186037 by Paul B. Henson.
 
   20 Apr 2008; Mike Frysinger <vapier@gentoo.org> nfs-utils-1.1.1.ebuild:
   Only leverage kerberos when USE="-nonfsv4" #212160.
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index 998414dc5587..26d5476fc906 100755
--- a/net-fs/nfs-utils/files/nfs.initd
+++ b/net-fs/nfs-utils/files/nfs.initd
@@ -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 @@ depend() {
 	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
 }
 
diff --git a/net-fs/nfs-utils/files/rpc.gssd.initd b/net-fs/nfs-utils/files/rpc.gssd.initd
index d56f7030816c..adcdf6cc1ffd 100755
--- a/net-fs/nfs-utils/files/rpc.gssd.initd
+++ b/net-fs/nfs-utils/files/rpc.gssd.initd
@@ -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 @@ mount_pipefs() {
 	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 $?
 }
diff --git a/net-fs/nfs-utils/files/rpc.svcgssd.initd b/net-fs/nfs-utils/files/rpc.svcgssd.initd
new file mode 100755
index 000000000000..19adbf5c6369
--- /dev/null
+++ b/net-fs/nfs-utils/files/rpc.svcgssd.initd
@@ -0,0 +1,37 @@
+#!/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 $?
+}
diff --git a/net-fs/nfs-utils/nfs-utils-1.0.12-r5.ebuild b/net-fs/nfs-utils/nfs-utils-1.0.12-r5.ebuild
index ae825b31fff4..18fcbec4c09c 100644
--- a/net-fs/nfs-utils/nfs-utils-1.0.12-r5.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.0.12-r5.ebuild
@@ -1,6 +1,6 @@
-# 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/nfs-utils-1.0.12-r5.ebuild,v 1.1 2007/09/15 02:12:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.0.12-r5.ebuild,v 1.2 2008/04/20 00:52:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -77,7 +77,7 @@ src_install() {
 
 	local f list=""
 	use !nonfsv4 && list="${list} rpc.idmapd"
-	use kerberos && list="${list} rpc.gssd"
+	use kerberos && list="${list} rpc.gssd rpc.svcgssd"
 	for f in nfs nfsmount rpc.statd ${list} ; do
 		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
 	done
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.0-r1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.0-r1.ebuild
index de1ad524222c..742ac706ace1 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.0-r1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # 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/nfs-utils-1.1.0-r1.ebuild,v 1.8 2008/01/08 15:07:22 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.0-r1.ebuild,v 1.9 2008/04/20 00:52:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -79,7 +79,7 @@ src_install() {
 
 	local f list=""
 	use !nonfsv4 && list="${list} rpc.idmapd"
-	use kerberos && list="${list} rpc.gssd"
+	use kerberos && list="${list} rpc.gssd rpc.svcgssd"
 	for f in nfs nfsmount rpc.statd ${list} ; do
 		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"
 	done
diff --git a/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild b/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild
index a87170e0211c..a8022bdd267c 100644
--- a/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild
+++ b/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild
@@ -1,6 +1,6 @@
 # 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/nfs-utils-1.1.1.ebuild,v 1.2 2008/04/20 00:39:26 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/nfs-utils-1.1.1.ebuild,v 1.3 2008/04/20 00:52:23 vapier Exp $
 
 inherit eutils flag-o-matic multilib
 
@@ -81,7 +81,7 @@ src_install() {
 	local f list=""
 	if use !nonfsv4 ; then
 		list="${list} rpc.idmapd"
-		use kerberos && list="${list} rpc.gssd"
+		use kerberos && list="${list} rpc.gssd rpc.svcgssd"
 	fi
 	for f in nfs nfsmount rpc.statd ${list} ; do
 		newinitd "${FILESDIR}"/${f}.initd ${f} || die "doinitd ${f}"