diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-11-07 01:52:03 +0100 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2024-11-11 03:53:24 +0100 |
commit | 52f46b77d7bafb7ce44f016e1793862873a3fc73 (patch) | |
tree | 3c6e48e9d42868fb014f7a67cc74db1009c9174d /src/network | |
parent | network: drop unnecessary size specifier (diff) | |
download | systemd-52f46b77d7bafb7ce44f016e1793862873a3fc73.tar.xz systemd-52f46b77d7bafb7ce44f016e1793862873a3fc73.zip |
network: reset 'configured' flags even if we keep DHCP lease and friends on reconfigure
Follow-up for 451c2baf30f50b95d73e648058c7c2348dbf0c31.
With the commits, reloading .network files does not release previously
acquired DHCP lease and friends if possible. If previously a DHCP client
was configured as not requesting DNS servers or so, then the previously
acquired lease might not contain any DNS servers. In that case, if the
new .network file enables UseDNS=, then the interface should enter the
configured state after a new lease is acquired. To achieve that, we need
to reset the flags.
With this change, the workaround applied to the test by the commit
451c2baf30f50b95d73e648058c7c2348dbf0c31 can be dropped.
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/networkd-link.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/network/networkd-link.c b/src/network/networkd-link.c index ab74260adb..f9047103c0 100644 --- a/src/network/networkd-link.c +++ b/src/network/networkd-link.c @@ -1136,6 +1136,15 @@ static int link_drop_dynamic_config(Link *link, Network *network) { link->lldp_rx = sd_lldp_rx_unref(link->lldp_rx); /* TODO: keep the received neighbors. */ link->lldp_tx = sd_lldp_tx_unref(link->lldp_tx); + /* Even if we do not release DHCP lease or so, reset 'configured' flags. Otherwise, e.g. if + * previously UseDNS= was disabled but is now enabled, link will enter configured state before + * expected DNS servers being acquired. */ + link->ipv4ll_address_configured = false; + link->dhcp4_configured = false; + link->dhcp6_configured = false; + link->dhcp_pd_configured = false; + link->ndisc_configured = false; + return r; } |