From: Roy Marples <roy@marples.name>
Date: Fri, 4 Jul 2008 13:58:31 +0000 (+0000)
Subject: Set the script correctly with MINIMAL.
X-Git-Tag: v4.0.2~238
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6331b9b95ce2b7cac172647667fe60f82a0b7af;p=thirdparty%2Fdhcpcd.git

Set the script correctly with MINIMAL.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index 9f2f3b32..26aa2501 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -600,12 +600,13 @@ main(int argc, char **argv)
 
 	options = xzalloc(sizeof(*options));
 	options->options |= DHCPCD_GATEWAY | DHCPCD_DAEMONISE;
+	options->timeout = DEFAULT_TIMEOUT;
+	strlcpy(options->script, SCRIPT, sizeof(options->script));
+
 #ifndef MINIMAL
 	options->options |= DHCPCD_CLIENTID;
-	strlcpy(options->script, SCRIPT, sizeof(options->script));
 	options->classid[0] = snprintf((char *)options->classid + 1, CLASSID_MAX_LEN,
 				       "%s %s", PACKAGE, VERSION);
-
 #endif
 #ifdef ENABLE_ARP
 	options->options |= DHCPCD_ARP;
@@ -613,7 +614,6 @@ main(int argc, char **argv)
 	options->options |= DHCPCD_IPV4LL;
  #endif
 #endif
-	options->timeout = DEFAULT_TIMEOUT;
 
 #ifdef CMDLINE_COMPAT
 	add_reqmask(options->reqmask, DHCP_DNSSERVER);