diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-09-01 15:18:01 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-01 15:18:01 +0000 |
| commit | 1d8c639b2baf945a44c203149093f3db058e775b (patch) | |
| tree | d563036ff0aca9ec9855693570f70cca9a73bdf7 /net-fs | |
| parent | Revision bump with full Gentoo Prefix support, signed off by maintainer with ... (diff) | |
| download | historical-1d8c639b2baf945a44c203149093f3db058e775b.tar.gz historical-1d8c639b2baf945a44c203149093f3db058e775b.tar.bz2 historical-1d8c639b2baf945a44c203149093f3db058e775b.zip | |
Drop --oknodo usage #377765 by Michael Mair-Keimberger.
Diffstat (limited to 'net-fs')
| -rw-r--r-- | net-fs/nfs-utils/ChangeLog | 5 | ||||
| -rwxr-xr-x | net-fs/nfs-utils/files/nfs.initd | 8 |
2 files changed, 7 insertions, 6 deletions
diff --git a/net-fs/nfs-utils/ChangeLog b/net-fs/nfs-utils/ChangeLog index e652b37de081..c03fc138e95f 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-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.183 2011/06/19 23:04:36 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/ChangeLog,v 1.184 2011/09/01 15:18:01 vapier Exp $ + + 01 Sep 2011; Mike Frysinger <vapier@gentoo.org> files/nfs.initd: + Drop --oknodo usage #377765 by Michael Mair-Keimberger. 19 Jun 2011; Mike Frysinger <vapier@gentoo.org> files/rpc.pipefs.initd: Remove shortcuts that result in silent errors #372297 by Sebastian Pipping. diff --git a/net-fs/nfs-utils/files/nfs.initd b/net-fs/nfs-utils/files/nfs.initd index 440680fd99ba..485d1beeaead 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-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 @@ start() { 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 |