]> git.ipfire.org Git - thirdparty/dhcpcd.git/commitdiff
Set the script correctly with MINIMAL.
authorRoy Marples <roy@marples.name>
Fri, 4 Jul 2008 13:58:31 +0000 (13:58 +0000)
committerRoy Marples <roy@marples.name>
Fri, 4 Jul 2008 13:58:31 +0000 (13:58 +0000)
dhcpcd.c

index 9f2f3b324e5f3d874e582e1eaccebcc4c14c8b6b..26aa2501b5b614739ae849919df6229c98186a90 100644 (file)
--- 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);