main/nfs-utils: update OpenRC services from Gentoo

1 files changed, 19 insertions, 11 deletions

diff --git a/main/nfs-utils/rpc.pipefs.initd b/main/nfs-utils/rpc.pipefs.initd
index 400b66fd5f..f971a49b39 100644
--- a/main/nfs-utils/rpc.pipefs.initd
+++ b/main/nfs-utils/rpc.pipefs.initd
@@ -1,24 +1,32 @@
 #!/sbin/openrc-run
-# Copyright 1999-2008 Gentoo Foundation
+# Copyright 1999-2014 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 $
+
+MNT="/var/lib/nfs/rpc_pipefs"
 
 mount_pipefs() {
+	local fstype=rpc_pipefs
+
+	# if things are already mounted, nothing to do
+	mountinfo -q ${MNT} && 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
+	grep -qs ${fstype} /proc/filesystems || modprobe -q sunrpc
+	# if still not available, the `mount` will issue an error for the user
 
 	# now just do it for kicks
-	mkdir -p /var/lib/nfs/rpc_pipefs
-	mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs
+	mkdir -p ${MNT}
+	mount -t ${fstype} ${fstype} ${MNT}
 }
 
 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"
+	ebegin "Setting up RPC pipefs"
 	mount_pipefs
+	eend $? "make sure you have NFS/SUNRPC enabled in your kernel"
+}
+
+stop() {
+	ebegin "Unmounting RPC pipefs"
+	umount ${MNT}
 	eend $?
 }