2012-10-05 23:14:48

by Mantas Mikulėnas

Subject: [PATCH] utils: Return status 0 on clean exits

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

2012-10-15 20:14:46

by Steve Dickson

Subject: Re: [PATCH] utils: Return status 0 on clean exits

On 05/10/12 19:14, Mantas Mikulėnas wrote:
> 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(-)
Committed....

steved.
>
> 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
> -- 1.7.12.2 -- To unsubscribe from this list: send the line "unsubscribe linux-nfs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
>