Compare commits

..

2 Commits

Author SHA1 Message Date
Yu Watanabe 3cd5924c85 network: make link become configured state when at least one dynamic protocol provide an address
Before this, to speed up the system boot with IPv4 only network,
we need to specify `IPv6AcceptRA=no`, as it is enabled by default.

Closes #15469.
2020-06-04 10:49:26 +02:00
Einsler Lee 168561f2eb change fs/file-max to LONG_MAX instead of ULONG_MAX
Since this has been changed in: 6e2f789484, the change should be synchronized.
2020-06-04 10:30:44 +02:00
2 changed files with 4 additions and 6 deletions

View File

@ -58,7 +58,7 @@ option('debug-extra', type : 'array', choices : ['hashmap', 'mmap-cache', 'sipha
option('memory-accounting-default', type : 'boolean', option('memory-accounting-default', type : 'boolean',
description : 'enable MemoryAccounting= by default') description : 'enable MemoryAccounting= by default')
option('bump-proc-sys-fs-file-max', type : 'boolean', option('bump-proc-sys-fs-file-max', type : 'boolean',
description : 'bump /proc/sys/fs/file-max to ULONG_MAX') description : 'bump /proc/sys/fs/file-max to LONG_MAX')
option('bump-proc-sys-fs-nr-open', type : 'boolean', option('bump-proc-sys-fs-nr-open', type : 'boolean',
description : 'bump /proc/sys/fs/nr_open to INT_MAX') description : 'bump /proc/sys/fs/nr_open to INT_MAX')
option('valgrind', type : 'boolean', value : false, option('valgrind', type : 'boolean', value : false,

View File

@ -1133,16 +1133,14 @@ void link_check_ready(Link *link) {
in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address)) in_addr_is_null(AF_INET6, (const union in_addr_union*) &link->ipv6ll_address))
return; return;
if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link)) && if ((link_dhcp4_enabled(link) || link_dhcp6_enabled(link) || link_ipv6_accept_ra_enabled(link)) &&
!link->dhcp4_configured && !link->dhcp4_configured &&
!link->dhcp6_configured && !link->dhcp6_configured &&
!link->ndisc_configured &&
!(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address)) !(link_ipv4ll_enabled(link, ADDRESS_FAMILY_FALLBACK_IPV4) && link->ipv4ll_address))
/* When DHCP is enabled, at least one protocol must provide an address, or /* When DHCP or RA is enabled, at least one protocol must provide an address, or
* an IPv4ll fallback address must be configured. */ * an IPv4ll fallback address must be configured. */
return; return;
if (link_ipv6_accept_ra_enabled(link) && !link->ndisc_configured)
return;
} }
if (link->state != LINK_STATE_CONFIGURED) if (link->state != LINK_STATE_CONFIGURED)