* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2008-05-05 4:36 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2008-05-05 4:36 UTC (permalink / raw
To: gentoo-commits
vapier 08/05/05 04:36:12
Modified: nfs.initd
Log:
fix copy & paste error in previous commit #219495 by Jonathan Adamczewski
(Portage version: 2.2_pre5)
Revision Changes Path
1.14 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.14&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.13&r2=1.14
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- nfs.initd 4 May 2008 09:53:34 -0000 1.13
+++ nfs.initd 5 May 2008 04:36:12 -0000 1.14
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2007 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.13 2008/05/04 09:53:34 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.14 2008/05/05 04:36:12 vapier Exp $
opts="reload"
@@ -22,7 +22,7 @@
myneed="${myneed} rpc.svcgssd"
fi
fi
- config /etc/fstab
+ config /etc/exports
need portmap rpc.statd ${myneed}
use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
after quota
--
gentoo-commits@lists.gentoo.org mailing list
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2009-01-31 22:12 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-31 22:12 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2009-01-31 22:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-31 22:13 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/31 22:13:56
Modified: nfs.initd
Log:
Add /proc/fs/nfs -> /proc/fs/nfsd fix again.
Revision Changes Path
1.16 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.16&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.16&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.15&r2=1.16
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- nfs.initd 31 Jan 2009 22:12:53 -0000 1.15
+++ nfs.initd 31 Jan 2009 22:13:56 -0000 1.16
@@ -1,7 +1,7 @@
#!/sbin/runscript
# 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.15 2009/01/31 22:12:53 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.16 2009/01/31 22:13:56 vapier Exp $
opts="reload"
@@ -55,9 +55,9 @@
# 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/nfs" /proc/mounts ; then
+ if ! grep -qs "nfsd /proc/fs/nfsd" /proc/mounts ; then
ebegin "Mounting nfsd filesystem in /proc"
- mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfs
+ mount -t nfsd -o nodev,noexec,nosuid nfsd /proc/fs/nfsd
eend $?
fi
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2009-01-31 22:19 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2009-01-31 22:19 UTC (permalink / raw
To: gentoo-commits
vapier 09/01/31 22:19:06
Modified: nfs.initd
Log:
Also use rpc.nfsd to try to shutdown nfsd #228127 by Maurice Volaski.
Revision Changes Path
1.17 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.17&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.17&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.16&r2=1.17
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- nfs.initd 31 Jan 2009 22:13:56 -0000 1.16
+++ nfs.initd 31 Jan 2009 22:19:06 -0000 1.17
@@ -1,7 +1,7 @@
#!/sbin/runscript
# 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.16 2009/01/31 22:13:56 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.17 2009/01/31 22:19:06 vapier Exp $
opts="reload"
@@ -106,6 +106,8 @@
start-stop-daemon --stop --oknodo --name nfsd --user root --signal 2
eend $?
ret=$((ret + $?))
+ # in case things don't work out ... #228127
+ rpc.nfsd 0
# When restarting the NFS server, running "exportfs -ua" probably
# isn't what the user wants. Running it causes all entries listed
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2009-02-27 1:41 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2009-02-27 1:41 UTC (permalink / raw
To: gentoo-commits
vapier 09/02/27 01:41:55
Modified: nfs.initd
Log:
Fixup bashism in init.d script #260149 by Timothy Redaelli.
(Portage version: 2.2_rc23/cvs/Linux x86_64)
Revision Changes Path
1.18 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.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.17&r2=1.18
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- nfs.initd 31 Jan 2009 22:19:06 -0000 1.17
+++ nfs.initd 27 Feb 2009 01:41:55 -0000 1.18
@@ -1,7 +1,7 @@
#!/sbin/runscript
# 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.17 2009/01/31 22:19:06 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.18 2009/02/27 01:41:55 vapier Exp $
opts="reload"
@@ -30,7 +30,8 @@
mkdir_nfsdirs() {
local d
- for d in /var/lib/nfs/{rpc_pipefs,v4recovery,v4root} ; do
+ for d in rpc_pipefs v4recovery v4root ; do
+ d="/var/lib/nfs/${d}"
[ ! -d "${d}" ] && mkdir -p "${d}"
done
}
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2010-07-26 1:02 Diego Petteno (flameeyes)
0 siblings, 0 replies; 13+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-07-26 1:02 UTC (permalink / raw
To: gentoo-commits
flameeyes 10/07/26 01:02:07
Modified: nfs.initd
Log:
Fix nfs init script dependency generation for kerberos exports.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.20 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.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.19&r2=1.20
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- nfs.initd 30 May 2009 22:01:43 -0000 1.19
+++ nfs.initd 26 Jul 2010 01:02:07 -0000 1.20
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.19 2009/05/30 22:01:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.20 2010/07/26 01:02:07 flameeyes Exp $
opts="reload"
@@ -18,7 +18,7 @@
depend() {
local myneed=""
if [ -e /etc/exports ] ; then
- if awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { exit 0 } END { exit 1 }' /etc/exports ; then
+ if awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { found=1; nextfile } END { exit !found }' /etc/exports ; then
myneed="${myneed} rpc.svcgssd"
fi
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2010-08-02 11:08 Diego Petteno (flameeyes)
0 siblings, 0 replies; 13+ messages in thread
From: Diego Petteno (flameeyes) @ 2010-08-02 11:08 UTC (permalink / raw
To: gentoo-commits
flameeyes 10/08/02 11:08:49
Modified: nfs.initd
Log:
Only require rpc.svcgssd if sec=krb is used rather than sec=sys (default). Thanks to Jared in bug #330795.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.21 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.21&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.21&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.20&r2=1.21
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- nfs.initd 26 Jul 2010 01:02:07 -0000 1.20
+++ nfs.initd 2 Aug 2010 11:08:49 -0000 1.21
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2010 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.20 2010/07/26 01:02:07 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.21 2010/08/02 11:08:49 flameeyes Exp $
opts="reload"
@@ -18,7 +18,7 @@
depend() {
local myneed=""
if [ -e /etc/exports ] ; then
- if awk '!/^[[:space:]]*#/ && $2 ~ /sec=/ { found=1; nextfile } END { exit !found }' /etc/exports ; then
+ if awk '!/^[[:space:]]*#/ && $2 ~ /sec=krb5/ { found=1; nextfile } END { exit !found }' /etc/exports ; then
myneed="${myneed} rpc.svcgssd"
fi
fi
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2010-08-07 21:13 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2010-08-07 21:13 UTC (permalink / raw
To: gentoo-commits
vapier 10/08/07 21:13:02
Modified: nfs.initd
Log:
Port logic over for detecting rpc.gssd needs in nfs init.d script #330795 by Jared.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Revision Changes Path
1.22 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.22&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.22&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.21&r2=1.22
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- nfs.initd 2 Aug 2010 11:08:49 -0000 1.21
+++ nfs.initd 7 Aug 2010 21:13:02 -0000 1.22
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2010 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.21 2010/08/02 11:08:49 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.22 2010/08/07 21:13:02 vapier Exp $
opts="reload"
@@ -18,9 +18,17 @@
depend() {
local myneed=""
if [ -e /etc/exports ] ; then
- if awk '!/^[[:space:]]*#/ && $2 ~ /sec=krb5/ { found=1; nextfile } END { exit !found }' /etc/exports ; then
- myneed="${myneed} rpc.svcgssd"
- fi
+ # XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
+ myneed="${myneed} $(
+ awk '!/^[[:space:]]*#/ {
+ # clear the path to avoid spurious matches
+ $1 = "";
+ if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
+ print "rpc.gssd"
+ exit 0
+ }
+ }' /etc/exports
+ )"
fi
config /etc/exports
need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2010-11-21 19:56 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2010-11-21 19:56 UTC (permalink / raw
To: gentoo-commits
vapier 10/11/21 19:56:57
Modified: nfs.initd
Log:
fix typo pointed out by Malte Starostik #346311 -- server uses svcgssd, not gssd (which is for clients)
(Portage version: 2.2.0_alpha4/cvs/Linux x86_64)
Revision Changes Path
1.23 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.23&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.23&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.22&r2=1.23
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- nfs.initd 7 Aug 2010 21:13:02 -0000 1.22
+++ nfs.initd 21 Nov 2010 19:56:56 -0000 1.23
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2010 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.22 2010/08/07 21:13:02 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.23 2010/11/21 19:56:56 vapier Exp $
opts="reload"
@@ -24,7 +24,7 @@
# clear the path to avoid spurious matches
$1 = "";
if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
- print "rpc.gssd"
+ print "rpc.svcgssd"
exit 0
}
}' /etc/exports
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2011-09-01 15:18 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-01 15:18 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/01 15:18:01
Modified: nfs.initd
Log:
Drop --oknodo usage #377765 by Michael Mair-Keimberger.
Revision Changes Path
1.25 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.25&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.25&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.24&r2=1.25
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- nfs.initd 6 Apr 2011 22:11:39 -0000 1.24
+++ nfs.initd 1 Sep 2011 15:18:01 -0000 1.25
@@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2011 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.24 2011/04/06 22:11:39 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.25 2011/09/01 15:18:01 vapier Exp $
opts="reload"
@@ -108,16 +108,14 @@
stop() {
local ret=0
- # Don't check NFSSERVER variable since it might have changed,
- # instead use --oknodo to smooth things over
ebegin "Stopping NFS mountd"
- start-stop-daemon --stop --oknodo --exec ${mountd}
+ start-stop-daemon --stop --exec ${mountd}
eend $?
ret=$((ret + $?))
# nfsd sets its process name to [nfsd] so don't look for $nfsd
ebegin "Stopping NFS daemon"
- start-stop-daemon --stop --oknodo --name nfsd --user root --signal 2
+ start-stop-daemon --stop --name nfsd --user root --signal 2
eend $?
ret=$((ret + $?))
# in case things don't work out ... #228127
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2011-09-18 1:51 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2011-09-18 1:51 UTC (permalink / raw
To: gentoo-commits
vapier 11/09/18 01:51:51
Modified: nfs.initd
Log:
Convert to extra_started_commands #381887 by teidakankan.
(Portage version: 2.2.0_alpha58/cvs/Linux x86_64)
Revision Changes Path
1.26 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.26&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.26&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.25&r2=1.26
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- nfs.initd 1 Sep 2011 15:18:01 -0000 1.25
+++ nfs.initd 18 Sep 2011 01:51:51 -0000 1.26
@@ -1,9 +1,9 @@
#!/sbin/runscript
# Copyright 1999-2011 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.25 2011/09/01 15:18:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.26 2011/09/18 01:51:51 vapier Exp $
-opts="reload"
+extra_started_commands="reload"
# This variable is used for controlling whether or not to run exportfs -ua;
# see stop() for more information
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2013-03-24 19:37 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2013-03-24 19:37 UTC (permalink / raw
To: gentoo-commits
vapier 13/03/24 19:37:22
Modified: nfs.initd
Log:
Process /etc/exports.d/*.exports too #459600 by Joakim Tjernlund.
(Portage version: 2.2.0_alpha169/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)
Revision Changes Path
1.27 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.27&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?rev=1.27&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs.initd?r1=1.26&r2=1.27
Index: nfs.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- nfs.initd 18 Sep 2011 01:51:51 -0000 1.26
+++ nfs.initd 24 Mar 2013 19:37:22 -0000 1.27
@@ -1,7 +1,7 @@
#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2013 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.26 2011/09/18 01:51:51 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/nfs.initd,v 1.27 2013/03/24 19:37:22 vapier Exp $
extra_started_commands="reload"
@@ -17,20 +17,18 @@
depend() {
local myneed=""
- if [ -e /etc/exports ] ; then
- # XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
- myneed="${myneed} $(
- awk '!/^[[:space:]]*#/ {
- # clear the path to avoid spurious matches
- $1 = "";
- if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
- print "rpc.svcgssd"
- exit 0
- }
- }' /etc/exports
- )"
- fi
- config /etc/exports
+ # XXX: no way to detect NFSv4 is desired and so need rpc.idmapd
+ myneed="${myneed} $(
+ awk '!/^[[:space:]]*#/ {
+ # clear the path to avoid spurious matches
+ $1 = "";
+ if ($0 ~ /[(][^)]*sec=(krb|spkm)[^)]*[)]/) {
+ print "rpc.svcgssd"
+ exit 0
+ }
+ }' /etc/exports /etc/exports.d/*.exports 2>/dev/null
+ )"
+ config /etc/exports /etc/exports.d/*.exports
need portmap rpc.statd ${myneed} ${NFS_NEEDED_SERVICES}
use ypbind net dns rpc.rquotad rpc.idmapd rpc.svcgssd
after quota
@@ -46,7 +44,7 @@
waitfor_exportfs() {
local pid=$1
- ( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 $pid 2>/dev/null ) &
+ ( sleep ${EXPORTFS_TIMEOUT:-30}; kill -9 ${pid} 2>/dev/null ) &
wait $1
}
@@ -91,7 +89,7 @@
# Exportfs likes to hang if networking isn't working.
# If that's the case, then try to kill it so the
# bootup process can continue.
- if grep -qs '^[[:space:]]*/' /etc/exports ; then
+ if grep -qs '^[[:space:]]*/' /etc/exports /etc/exports.d/*.exports ; then
ebegin "Exporting NFS directories"
${exportfs} -r &
waitfor_exportfs $!
^ permalink raw reply [flat|nested] 13+ messages in thread
* [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd
@ 2014-06-20 6:21 Mike Frysinger (vapier)
0 siblings, 0 replies; 13+ messages in thread
From: Mike Frysinger (vapier) @ 2014-06-20 6:21 UTC (permalink / raw
To: gentoo-commits
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 $?
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2014-06-20 6:21 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-03-24 19:37 [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: nfs.initd Mike Frysinger (vapier)
-- strict thread matches above, loose matches on Subject: below --
2014-06-20 6:21 Mike Frysinger (vapier)
2011-09-18 1:51 Mike Frysinger (vapier)
2011-09-01 15:18 Mike Frysinger (vapier)
2010-11-21 19:56 Mike Frysinger (vapier)
2010-08-07 21:13 Mike Frysinger (vapier)
2010-08-02 11:08 Diego Petteno (flameeyes)
2010-07-26 1:02 Diego Petteno (flameeyes)
2009-02-27 1:41 Mike Frysinger (vapier)
2009-01-31 22:19 Mike Frysinger (vapier)
2009-01-31 22:13 Mike Frysinger (vapier)
2009-01-31 22:12 Mike Frysinger (vapier)
2008-05-05 4:36 Mike Frysinger (vapier)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox