From patchwork Fri Oct 5 23:14:26 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Mantas_Mikul=C4=97nas?= X-Patchwork-Id: 1556291 Return-Path: X-Original-To: patchwork-linux-nfs@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id C219BDF24C for ; Fri, 5 Oct 2012 23:15:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753957Ab2JEXOt (ORCPT ); Fri, 5 Oct 2012 19:14:49 -0400 Received: from mail-wi0-f172.google.com ([209.85.212.172]:36644 "EHLO mail-wi0-f172.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753114Ab2JEXOs (ORCPT ); Fri, 5 Oct 2012 19:14:48 -0400 Received: by mail-wi0-f172.google.com with SMTP id hq12so1436417wib.1 for ; Fri, 05 Oct 2012 16:14:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=sNJzNyIq1Camochc6EFiXELTAzJdp25MGXg1p2WHlt0=; b=oAv005pezDAa+rqhb2nBAscY+DeH4dWVEv7Ye91FUAPiDNVeuzS3E2ZXdv2O27qpv4 CycW7lITASfOnXL3DqhLyDcrCJPT+5Com97eR9EEMYPgGcVwHtNs0o+pXRUTmJrdCA9H On6eUCFftiLmz7vs61nYP0VT43EBPhwUXybMMHWJghGd5zynHJ4nCxEkoO75ZBreStv4 n+4m7yyhjn5oMiUXn0W6HF/O6Q71egmubTvDgzvWwXiQFAIaqSeAKnMkA5e+Ci6AWdZw 34E+RwMJ0MGwIh9vPBm0L+mNtyu1Mu/MkxGVC9ajaZ7Vsn2hG9/O2zRS7XH0LoqOBqtj 5D0A== Received: by 10.180.100.136 with SMTP id ey8mr6264548wib.1.1349478886479; Fri, 05 Oct 2012 16:14:46 -0700 (PDT) Received: from localhost (78-60-211-195.static.zebra.lt. [78.60.211.195]) by mx.google.com with ESMTPS id cl8sm4938739wib.10.2012.10.05.16.14.44 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 05 Oct 2012 16:14:45 -0700 (PDT) From: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= To: linux-nfs@vger.kernel.org Cc: =?UTF-8?q?Mantas=20Mikul=C4=97nas?= Subject: [PATCH] utils: Return status 0 on clean exits Date: Sat, 6 Oct 2012 02:14:26 +0300 Message-Id: <1349478866-680992-1-git-send-email-grawity@gmail.com> X-Mailer: git-send-email 1.7.12.2 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Some init systems actually expect daemons to return 0 on success. --- utils/gssd/gssd.c | 2 +- utils/gssd/svcgssd.c | 2 +- utils/mountd/mountd.c | 3 ++- utils/statd/statd.c | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/utils/gssd/gssd.c b/utils/gssd/gssd.c index 7825255..a3292c9 100644 --- a/utils/gssd/gssd.c +++ b/utils/gssd/gssd.c @@ -71,7 +71,7 @@ sig_die(int signal) if (root_uses_machine_creds) gssd_destroy_krb5_machine_creds(); printerr(1, "exiting on signal %d\n", signal); - exit(1); + exit(0); } void diff --git a/utils/gssd/svcgssd.c b/utils/gssd/svcgssd.c index 1afff9e..8aee3b2 100644 --- a/utils/gssd/svcgssd.c +++ b/utils/gssd/svcgssd.c @@ -153,7 +153,7 @@ sig_die(int signal) { /* destroy krb5 machine creds */ printerr(1, "exiting on signal %d\n", signal); - exit(1); + exit(0); } void diff --git a/utils/mountd/mountd.c b/utils/mountd/mountd.c index bcf5080..993b6e6 100644 --- a/utils/mountd/mountd.c +++ b/utils/mountd/mountd.c @@ -196,7 +196,8 @@ killer (int sig) wait_for_workers(); } cleanup_lockfiles(); - xlog (L_FATAL, "Caught signal %d, un-registering and exiting.", sig); + xlog (L_NOTICE, "Caught signal %d, un-registering and exiting.", sig); + exit(0); } static void diff --git a/utils/statd/statd.c b/utils/statd/statd.c index 01fdb41..652546c 100644 --- a/utils/statd/statd.c +++ b/utils/statd/statd.c @@ -99,7 +99,8 @@ static void killer (int sig) { statd_unregister (); - xlog_err ("Caught signal %d, un-registering and exiting", sig); + xlog(D_GENERAL, "Caught signal %d, un-registering and exiting", sig); + exit(0); } static void