[gentoo-commits] gentoo-x86 commit in net-fs/nfs-utils/files: rpc.statd.initd nfs-utils-1.3.2-background-statd.patch

["Tim Harder (radhermit)" <radhermit@gentoo.org>]

radhermit    15/02/02 13:47:41

  Modified:             rpc.statd.initd
  Added:                nfs-utils-1.3.2-background-statd.patch
  Log:
  Use upstream fix for backgrounding statd so it works for systemd as well.
  
  (Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key 4AB3E85B4F064CA3)

Revision  Changes    Path
1.9                  net-fs/nfs-utils/files/rpc.statd.initd

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?rev=1.9&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?rev=1.9&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd?r1=1.8&r2=1.9

Index: rpc.statd.initd
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- rpc.statd.initd	31 Jan 2015 22:59:37 -0000	1.8
+++ rpc.statd.initd	2 Feb 2015 13:47:41 -0000	1.9
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.8 2015/01/31 22:59:37 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-fs/nfs-utils/files/rpc.statd.initd,v 1.9 2015/02/02 13:47:41 radhermit Exp $
 
 [ -e /etc/conf.d/nfs ] && . /etc/conf.d/nfs
 
@@ -22,7 +22,7 @@
 	fi
 
 	ebegin "Starting NFS statd"
-	start-stop-daemon --start --background --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
+	start-stop-daemon --start --exec ${rpc_bin} -- --no-notify ${OPTS_RPC_STATD}
 	eend $?
 }
 



1.1                  net-fs/nfs-utils/files/nfs-utils-1.3.2-background-statd.patch

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
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

Index: nfs-utils-1.3.2-background-statd.patch
===================================================================
From 17a3e5bffb7110d46de1bf42b64b90713ff5ea50 Mon Sep 17 00:00:00 2001
From: Chris Mayo <aklhfex@gmail.com>
Date: Sun, 1 Feb 2015 12:03:46 -0500
Subject: [PATCH] statd: Fix test for foreground mode

daemon_init parameter has the opposite sense
to code removed in commit 7addf9d

Signed-off-by: Chris Mayo <aklhfex@gmail.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
---
 utils/statd/statd.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/statd/statd.c b/utils/statd/statd.c
index 60ce6d1..2b7a167 100644
--- a/utils/statd/statd.c
+++ b/utils/statd/statd.c
@@ -393,7 +393,7 @@ int main (int argc, char **argv)
 		simulator (--argc, ++argv);	/* simulator() does exit() */
 #endif
 
-	daemon_init(!(run_mode & MODE_NODAEMON));
+	daemon_init((run_mode & MODE_NODAEMON));
 
 	if (run_mode & MODE_LOG_STDERR) {
 		xlog_syslog(0);
-- 
2.2.2