shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-12 09:17:44 +03:00
Code

network: apply activation policy only when it is once activated

Browse Source 
Otherwise, e.g., if activation policy is always-up is set for bond
slave, then setting bond configuration may fail.
This commit is contained in:
Yu Watanabe 2021-06-06 15:24:43 +09:00
parent da4929eeb9
commit 899b0e5eec
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/network/networkd-link.c
View File

@ -1567,7 +1567,7 @@ static int link_admin_state_up(Link *link) {
if (!link->network)
return 0;
if (link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_DOWN) {
if (link->activated && link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_DOWN) {
log_link_info(link, "ActivationPolicy is \"always-off\", forcing link down");
return link_down(link);
}
@ -1587,7 +1587,7 @@ static int link_admin_state_down(Link *link) {
if (!link->network)
return 0;
if (link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_UP) {
if (link->activated && link->network->activation_policy == ACTIVATION_POLICY_ALWAYS_UP) {
log_link_info(link, "ActivationPolicy is \"always-on\", forcing link up");
return link_up(link);
}