Gentoo Archives: gentoo-commits

From: "Tim Harder (radhermit)" <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: rpc.statd.initd nfs-utils-1.3.2-background-statd.patch
Date: Mon, 02 Feb 2015 13:47:45
Message-Id: 20150202134741.B209C10E5C@oystercatcher.gentoo.org
1 radhermit 15/02/02 13:47:41
2
3 Modified: rpc.statd.initd
4 Added: nfs-utils-1.3.2-background-statd.patch
5 Log:
6 Use upstream fix for backgrounding statd so it works for systemd as well.
7
8 (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)
9
10 Revision Changes Path
11 1.9 net-fs/nfs-utils/files/rpc.statd.initd
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?rev=1.9&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?rev=1.9&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?r1=1.8&r2=1.9
16
17 Index: rpc.statd.initd
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v
20 retrieving revision 1.8
21 retrieving revision 1.9
22 diff -u -r1.8 -r1.9
23 --- rpc.statd.initd 31 Jan 2015 22:59:37 -0000 1.8
24 +++ rpc.statd.initd 2 Feb 2015 13:47:41 -0000 1.9
25 @@ -1,7 +1,7 @@
26 #!/sbin/runscript
27 # Copyright 1999-2015 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.8 2015/01/31 22:59:37 radhermit Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.9 2015/02/02 13:47:41 radhermit Exp $
31
32 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
33
34 @@ -22,7 +22,7 @@
35 fi
36
37 ebegin "Starting NFS statd"
38 - start-stop-daemon --start --background --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
39 + start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
40 eend $?
41 }
42
43
44
45
46 1.1 net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch
47
48 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch?rev=1.1&view=markup
49 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch?rev=1.1&content-type=text/plain
50
51 Index: nfs-utils-1.3.2-background-statd.patch
52 ===================================================================
53 From 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 Mon Sep 17 00:00:00 2001
54 From: Chris Mayo <aklhfex@×××××.com>
55 Date: Sun, 1 Feb 2015 12:03:46 -0500
56 Subject: [PATCH] statd: Fix test for foreground mode
57
58 daemon_init parameter has the opposite sense
59 to code removed in commit 7addf9d
60
61 Signed-off-by: Chris Mayo <aklhfex@×××××.com>
62 Signed-off-by: Steve Dickson <steved@××××××.com>
63 ---
64 utils/statd/statd.c | 2 +-
65 1 file changed, 1 insertion(+), 1 deletion(-)
66
67 diff --git a/utils/statd/statd.c b/utils/statd/statd.c
68 index 60ce6d1..2b7a167 100644
69 --- a/utils/statd/statd.c
70 +++ b/utils/statd/statd.c
71 @@ -393,7 +393,7 @@ int main (int argc, char **argv)
72 simulator (--argc, ++argv); /* simulator() does exit() */
73 #endif
74
75 - daemon_init(!(run_mode & MODE_NODAEMON));
76 + daemon_init((run_mode & MODE_NODAEMON));
77
78 if (run_mode & MODE_LOG_STDERR) {
79 xlog_syslog(0);
80 --
81 2.2.2