vapier 14/06/20 06:21:22 Modified: nfs.initd Log: Drop rpc_pipefs creation as the rpc.pipefs.initd takes care of it. Switch to `mountinfo` to see if nfsd is already mounted.
Revision Changes Path 1.28 net-fs/nfs-utils/files/nfs.initd file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.28&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.28&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.27&r2=1.28 Index: nfs.initd =================================================================== RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v retrieving revision 1.27 retrieving revision 1.28 diff -u -r1.27 -r1.28 --- nfs.initd 24 Mar 2013 19:37:22 -0000 1.27 +++ nfs.initd 20 Jun 2014 06:21:22 -0000 1.28 @@ -1,7 +1,7 @@ #!/sbin/runscript -# Copyright 1999-2013 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/nfs.initd,v 1.27 2013/03/24 19:37:22 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.28 2014/06/20 06:21:22 vapier Exp $ extra_started_commands="reload" @@ -36,7 +36,7 @@ mkdir_nfsdirs() { local d - for d in rpc_pipefs v4recovery v4root ; do + for d in v4recovery v4root ; do d="/var/lib/nfs/${d}" [ ! -d "${d}" ] && mkdir -p "${d}" done @@ -62,7 +62,7 @@ # This is the new "kernel 2.6 way" to handle the exports file if grep -qs nfsd /proc/filesystems ; then - if ! grep -qs "nfsd /proc/fs/nfsd" /proc/mounts ; then + if ! mountinfo -q /proc/fs/nfsd ; then ebegin "Mounting nfsd filesystem in /proc" mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfsd eend $?
