summaryrefslogtreecommitdiff
path: root/net-fs
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2009-01-31 22:19:06 +0000
committerMike Frysinger <vapier@gentoo.org>2009-01-31 22:19:06 +0000
commit847ff601a6107188d44d717543b59c40a7be6ddb (patch)
tree50c988dc61a3c219a3f90904b57c33616910ae87 /net-fs
parentMake sure stop() works even if rpc.statd is dead so init.d doesnt fake stop s... (diff)
downloadhistorical-847ff601a6107188d44d717543b59c40a7be6ddb.tar.gz
historical-847ff601a6107188d44d717543b59c40a7be6ddb.tar.bz2
historical-847ff601a6107188d44d717543b59c40a7be6ddb.zip
Also use rpc.nfsd to try to shutdown nfsd #228127 by Maurice Volaski.
Diffstat (limited to 'net-fs')
-rw-r--r--net-fs/nfs-utils/ChangeLog5
-rwxr-xr-xnet-fs/nfs-utils/files/nfs.initd4
2 files changed, 7 insertions, 2 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog
index 49051f840a0e..3c4f0bc7e058 100644
--- a/net-fs/nfs-utils/ChangeLog
+++ b/net-fs/nfs-utils/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for net-fs/nfs-utils
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.143 2009/01/31 22:16:11 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.144 2009/01/31 22:19:05 vapier Exp $
+
+ 31 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/nfs.initd:
+ Also use rpc.nfsd to try to shutdown nfsd #228127 by Maurice Volaski.
31 Jan 2009; Mike Frysinger <vapier@gentoo.org> files/rpc.statd.initd:
Make sure stop() works even if rpc.statd is dead so init.d doesnt fake
diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd
index e19ad577d0c5..6021326ad84e 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-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 @@ stop() {
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