Split rpc.pipefs mounting into its own init.d script so we handle parallel execution properly #238593 by Michele Schiavo.

Package-Manager: portage-2.2_rc12/cvs/Linux 2.6.26.2 x86_64

4 files changed, 31 insertions, 72 deletions

diff --git a/net-fs/nfs-utils/files/rpc.gssd.initd b/net-fs/nfs-utils/files/rpc.gssd.initd
index b265e8942d92..f1b8f8774564 100755
--- a/net-fs/nfs-utils/files/rpc.gssd.initd
+++ b/net-fs/nfs-utils/files/rpc.gssd.initd
@@ -1,35 +1,17 @@
 #!/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.gssd.initd,v 1.10 2008/08/16 05:16:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.gssd.initd,v 1.11 2008/10/26 09:02:47 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
 depend() {
 	use ypbind net
-	need portmap
+	need portmap rpc.pipefs
 	after quota
 }
 
-mount_pipefs() {
-	# if things are already mounted, let's just return
-	grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0
-
-	# if rpc_pipefs is not available, try to load sunrpc for it #219566
-	grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc
-	# if still not available, let's bail
-	grep -qs rpc_pipefs /proc/filesystems || return 1
-
-	# now just do it for kicks
-	mkdir -p /var/lib/nfs/rpc_pipefs
-	ebegin "Mounting RPC pipefs"
-	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-	eend $?
-}
-
 start() {
-	mount_pipefs
-
 	ebegin "Starting gssd"
 	start-stop-daemon --start --exec /usr/sbin/rpc.gssd -- ${OPTS_RPC_GSSD}
 	eend $?
diff --git a/net-fs/nfs-utils/files/rpc.idmapd.initd b/net-fs/nfs-utils/files/rpc.idmapd.initd
index aeaf976b98c1..252804f5bfd6 100755
--- a/net-fs/nfs-utils/files/rpc.idmapd.initd
+++ b/net-fs/nfs-utils/files/rpc.idmapd.initd
@@ -1,42 +1,19 @@
 #!/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.idmapd.initd,v 1.6 2008/05/04 09:53:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.idmapd.initd,v 1.7 2008/10/26 09:02:47 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
 rpc_bin=/usr/sbin/rpc.idmapd
 
-# since baselayout doesn't export this sort of information, we need
-# to hack around it ... this is to keep from needlessly unmounting/mounting
-# rpc_pipefs during a restart ...
-restarting="no"
-
 depend() {
 	use ypbind net
-	need portmap
+	need portmap rpc.pipefs
 	after quota
 }
 
-mount_pipefs() {
-	# if things are already mounted, let's just return
-	grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0
-
-	# if rpc_pipefs is not available, try to load sunrpc for it #219566
-	grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc
-	# if still not available, let's bail
-	grep -qs rpc_pipefs /proc/filesystems || return 1
-
-	# now just do it for kicks
-	mkdir -p /var/lib/nfs/rpc_pipefs
-	ebegin "Mounting RPC pipefs"
-	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-	eend $?
-}
-
 start() {
-	mount_pipefs
-
 	ebegin "Starting idmapd"
 	${rpc_bin} ${OPTS_RPC_IDMAPD}
 	eend $?
@@ -47,9 +24,3 @@ stop() {
 	start-stop-daemon --stop --exec ${rpc_bin}
 	eend $?
 }
-
-restart() {
-	restarting="yes"
-	svc_stop
-	svc_start
-}
diff --git a/net-fs/nfs-utils/files/rpc.pipefs.initd b/net-fs/nfs-utils/files/rpc.pipefs.initd
new file mode 100644
index 000000000000..701ac77892b7
--- /dev/null
+++ b/net-fs/nfs-utils/files/rpc.pipefs.initd
@@ -0,0 +1,24 @@
+#!/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.pipefs.initd,v 1.1 2008/10/26 09:02:47 vapier Exp $
+
+mount_pipefs() {
+	# if rpc_pipefs is not available, try to load sunrpc for it #219566
+	grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc
+	# if still not available, let's bail
+	grep -qs rpc_pipefs /proc/filesystems || return 1
+
+	# now just do it for kicks
+	mkdir -p /var/lib/nfs/rpc_pipefs
+	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+}
+
+start() {
+	# if things are already mounted, let's just return
+	grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0
+
+	ebegin "Mounting RPC pipefs"
+	mount_pipefs
+	eend $?
+}
diff --git a/net-fs/nfs-utils/files/rpc.svcgssd.initd b/net-fs/nfs-utils/files/rpc.svcgssd.initd
index 9bad1c89bd84..74383e24dbaf 100755
--- a/net-fs/nfs-utils/files/rpc.svcgssd.initd
+++ b/net-fs/nfs-utils/files/rpc.svcgssd.initd
@@ -1,35 +1,17 @@
 #!/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.4 2008/08/16 05:16:16 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.svcgssd.initd,v 1.5 2008/10/26 09:02:47 vapier Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
 depend() {
 	use ypbind net
-	need portmap
+	need portmap rpc.pipefs
 	after quota
 }
 
-mount_pipefs() {
-	# if things are already mounted, let's just return
-	grep -qs "rpc_pipefs /var/lib/nfs/rpc_pipefs" /proc/mounts && return 0
-
-	# if rpc_pipefs is not available, try to load sunrpc for it #219566
-	grep -qs rpc_pipefs /proc/filesystems || modprobe -q sunrpc
-	# if still not available, let's bail
-	grep -qs rpc_pipefs /proc/filesystems || return 1
-
-	# now just do it for kicks
-	mkdir -p /var/lib/nfs/rpc_pipefs
-	ebegin "Mounting RPC pipefs"
-	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
-	eend $?
-}
-
 start() {
-	mount_pipefs
-
 	ebegin "Starting svcgssd"
 	start-stop-daemon --start --exec /usr/sbin/rpc.svcgssd -- ${OPTS_RPC_SVCGSSD}
 	eend $?