From patchwork Fri Oct 24 13:13:06 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Dickson X-Patchwork-Id: 5147351 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BC5F9C11AC for ; Fri, 24 Oct 2014 13:13:18 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 11AED20265 for ; Fri, 24 Oct 2014 13:13:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 146C620256 for ; Fri, 24 Oct 2014 13:13:17 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756595AbaJXNNL (ORCPT ); Fri, 24 Oct 2014 09:13:11 -0400 Received: from mx1.redhat.com ([209.132.183.28]:54914 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756550AbaJXNNK (ORCPT ); Fri, 24 Oct 2014 09:13:10 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id s9ODD8a4002853 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=FAIL) for ; Fri, 24 Oct 2014 09:13:09 -0400 Received: from smallhat.boston.devel.redhat.com (vpn-50-230.rdu2.redhat.com [10.10.50.230]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id s9ODD8Ya023494 for ; Fri, 24 Oct 2014 09:13:08 -0400 From: Steve Dickson To: Linux NFS Mailing list Subject: [PATCH] rpcbind: exit gracefully on termination Date: Fri, 24 Oct 2014 09:13:06 -0400 Message-Id: <1414156386-16427-1-git-send-email-steved@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP When systemd bring rpcbind down, via an expect signal, exit gracefully with a zero status and don't log a meaningless message. Signed-off-by: Steve Dickson --- src/rpcbind.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/rpcbind.c b/src/rpcbind.c index 83dbe93..1924d97 100644 --- a/src/rpcbind.c +++ b/src/rpcbind.c @@ -726,11 +726,9 @@ terminate(int dummy /*__unused*/) unlink(_PATH_RPCBINDSOCK); unlink(RPCBINDDLOCK); #ifdef WARMSTART - syslog(LOG_ERR, - "rpcbind terminating on signal. Restart with \"rpcbind -w\""); write_warmstart(); /* Dump yourself */ #endif - exit(2); + exit(0); /* exit gracefully */ } void