Mercurial > hg > dhcpcd
diff src/if-options.c @ 5546:08426e8a98a7 draft
DHCP6: Delegated activations work once more
This was broken with the --noconfigure option in dhcpcd-9.3.3
| author | Roy Marples <roy@marples.name> |
|---|---|
| date | Sat, 21 Nov 2020 11:59:07 +0000 |
| parents | a0d828e25482 |
| children | dba7608e00b3 |
line wrap: on
line diff
--- a/src/if-options.c Sat Nov 21 08:46:30 2020 +0000 +++ b/src/if-options.c Sat Nov 21 11:59:07 2020 +0000 @@ -2343,6 +2343,8 @@ #endif /* Inherit some global defaults */ + if (ctx->options & DHCPCD_CONFIGURE) + ifo->options |= DHCPCD_CONFIGURE; if (ctx->options & DHCPCD_PERSISTENT) ifo->options |= DHCPCD_PERSISTENT; if (ctx->options & DHCPCD_SLAACPRIVATE) @@ -2371,8 +2373,8 @@ if ((ifo = default_config(ctx)) == NULL) return NULL; if (default_options == 0) { - default_options |= DHCPCD_DAEMONISE | - DHCPCD_CONFIGURE | DHCPCD_GATEWAY; + default_options |= DHCPCD_CONFIGURE | DHCPCD_DAEMONISE | + DHCPCD_GATEWAY; #ifdef INET skip = socket(PF_INET, SOCK_DGRAM, 0); if (skip != -1) {