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

[Mike Frysinger (vapier)]

vapier      09/01/31 22:12:53

  Modified:             nfs.initd
  Log:
  Restart rpc.idmapd if nfsd is a module #220747 by Jochen Radmacher.

Revision  Changes    Path
1.15                 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.15&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.14&r2=1.15

Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- nfs.initd	5 May 2008 04:36:12 -0000	1.14
+++ nfs.initd	31 Jan 2009 22:12:53 -0000	1.15
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2009 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.14 2008/05/05 04:36:12 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.15 2009/01/31 22:12:53 vapier Exp $
 
 opts="reload"
 
@@ -42,9 +42,15 @@
 }
 
 mount_nfsd() {
-	# Make sure nfs support is loaded in the kernel #64709
-	if [ -e /proc/modules ] && ! grep -qs nfsd /proc/filesystems ; then
-		modprobe -q nfsd
+	if [ -e /proc/modules ] ; then
+		# Make sure nfs support is loaded in the kernel #64709
+		if ! grep -qs nfsd /proc/filesystems ; then
+			modprobe -q nfsd
+		fi
+		# Restart idmapd if needed #220747
+		if grep -qs nfsd /proc/modules ; then
+			killall -q -HUP rpc.idmapd
+		fi
 	fi
 
 	# This is the new "kernel 2.6 way" to handle the exports file