diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-06-20 06:21:22 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-06-20 06:21:22 +0000 |
| commit | d02895863e5366749bbbdebb7bab1175116cae5b (patch) | |
| tree | dd4da299973b00bb8cdcb9db246d56ade100d324 /net-fs | |
| parent | Lock tests to rails:3.2 like upstream. Fix minitest invocation. Add ruby20. (diff) | |
| download | historical-d02895863e5366749bbbdebb7bab1175116cae5b.tar.gz historical-d02895863e5366749bbbdebb7bab1175116cae5b.tar.bz2 historical-d02895863e5366749bbbdebb7bab1175116cae5b.zip | |
Drop rpc_pipefs creation as the rpc.pipefs.initd takes care of it. Switch to `mountinfo` to see if nfsd is already mounted.
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 6 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfs.initd | 8 |
2 files changed, 9 insertions, 5 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index 592c3031b800..57b1f2c22dea 100644 --- a/net-fs/nfs-utils/ChangeLog +++ b/net-fs/nfs-utils/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-fs/nfs-utils # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.245 2014/06/20 04:33:57 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.246 2014/06/20 06:21:22 vapier Exp $ + + 20 Jun 2014; Mike Frysinger <vapier@gentoo.org> files/nfs.initd: + Drop rpc_pipefs creation as the rpc.pipefs.initd takes care of it. + Switch to `mountinfo` to see if nfsd is already mounted. 20 Jun 2014; Mike Frysinger <vapier@gentoo.org> files/rpc.pipefs.initd: Unmount rpc.pipefs on stop as it is in /var #491714 by Jan Lam. diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd index ab25b4d18bee..e4239b70c470 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-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 @@ depend() { 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 @@ mount_nfsd() { # 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 $? |