From: Roy Marples <roy@marples.name>
Date: Tue, 12 Aug 2008 23:56:09 +0000 (+0000)
Subject: Fix -n when already running.
X-Git-Tag: v4.0.2~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16ceedbb2da1112848b71b58f617d1c3bb94e0e7;p=thirdparty%2Fdhcpcd.git

Fix -n when already running.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index a79bea7c..97dba47c 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -865,7 +865,11 @@ main(int argc, char **argv)
 			       ""PACKAGE" not running");
 			unlink(options->pidfile);
 		}
-		if (i == 0 && (sig == SIGTERM || sig == SIGHUP)) {
+		if (i == 0) {
+			if (sig == SIGALRM) {
+				retval = EXIT_SUCCESS;
+				goto abort;
+			}
 			/* Spin until it exits */
 			logger(LOG_INFO, "waiting for pid %d to exit", pid);
 			ts.tv_sec = 0;