Archives
Archives
| From: | "Mike Frysinger (vapier)" <vapier@g.o> |
|---|---|
| To: | gentoo-commits@l.g.o |
| Subject: | [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: rpc.statd.initd |
| Date: | Sat, 31 Jan 2009 22:16:13 |
| Message-Id: | E1LTO8J-0006pd-Fr@stork.gentoo.org |
| 1 | vapier 09/01/31 22:16:11 |
| 2 | |
| 3 | Modified: rpc.statd.initd |
| 4 | Log: |
| 5 | Make sure stop() works even if rpc.statd is dead so init.d doesnt fake stop silently. |
| 6 | |
| 7 | Revision Changes Path |
| 8 | 1.7 net-fs/nfs-utils/files/rpc.statd.initd |
| 9 | |
| 10 | file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?rev=1.7&view=markup |
| 11 | plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?rev=1.7&content-type=text/plain |
| 12 | diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?r1=1.6&r2=1.7 |
| 13 | |
| 14 | Index: rpc.statd.initd |
| 15 | =================================================================== |
| 16 | RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v |
| 17 | retrieving revision 1.6 |
| 18 | retrieving revision 1.7 |
| 19 | diff -u -r1.6 -r1.7 |
| 20 | --- rpc.statd.initd 4 Feb 2008 22:23:24 -0000 1.6 |
| 21 | +++ rpc.statd.initd 31 Jan 2009 22:16:11 -0000 1.7 |
| 22 | @@ -1,7 +1,7 @@ |
| 23 | #!/sbin/runscript |
| 24 | -# Copyright 1999-2007 Gentoo Foundation |
| 25 | +# Copyright 1999-2009 Gentoo Foundation |
| 26 | # Distributed under the terms of the GNU General Public License v2 |
| 27 | -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.6 2008/02/04 22:23:24 vapier Exp $ |
| 28 | +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.7 2009/01/31 22:16:11 vapier Exp $ |
| 29 | |
| 30 | [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs |
| 31 | |
| 32 | @@ -14,21 +14,19 @@ |
| 33 | after quota |
| 34 | } |
| 35 | |
| 36 | -is_running() { |
| 37 | +start() { |
| 38 | # Don't start rpc.statd if already started by someone else ... |
| 39 | # Don't try and kill it if it's already dead ... |
| 40 | - killall -q -0 ${rpc_bin} |
| 41 | -} |
| 42 | + if killall -q -0 ${rpc_bin} ; then |
| 43 | + return 0 |
| 44 | + fi |
| 45 | |
| 46 | -start() { |
| 47 | - is_running && return 0 |
| 48 | ebegin "Starting NFS statd" |
| 49 | start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD} |
| 50 | eend $? |
| 51 | } |
| 52 | |
| 53 | stop() { |
| 54 | - is_running || return 1 |
| 55 | ebegin "Stopping NFS statd" |
| 56 | start-stop-daemon --stop --exec ${rpc_bin} --pidfile /var/run/rpc.statd.pid |
| 57 | eend $? |