From: Roy Marples <roy@marples.name>
Date: Mon, 21 Dec 2015 11:07:04 +0000 (+0000)
Subject: -g must go via the command socket as it's no longer SIGUSR1
X-Git-Tag: v6.10.0~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9820ccc8a32d07fd7e6a6daf939b2d07f7323040;p=thirdparty%2Fdhcpcd.git

-g must go via the command socket as it's no longer SIGUSR1
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 43bfb9b4..6ba4ace9 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1482,16 +1482,12 @@ main(int argc, char **argv)
 		case 'f':
 			ctx.cffile = optarg;
 			break;
-#ifdef USE_SIGNALS
-		case 'g':
-			sig = SIGUSR1;
-			siga = "USR1";
-			break;
 		case 'j':
 			ctx.logfile = strdup(optarg);
 			logger_close(&ctx);
 			logger_open(&ctx);
 			break;
+#ifdef USE_SIGNALS
 		case 'k':
 			sig = SIGALRM;
 			siga = "ARLM";
@@ -1500,6 +1496,7 @@ main(int argc, char **argv)
 			sig = SIGHUP;
 			siga = "HUP";
 			break;
+		case 'g':
 		case 'p':
 			/* Force going via command socket as we're
 			 * out of user definable signals. */