shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

Merge pull request #12577 from yuwata/test-network-issue-12344

Browse Source 
test-network: fix test_bond_operstate
This commit is contained in:
Yu Watanabe 2019-05-19 09:26:14 +09:00 committed by GitHub
commit a188bcffc3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 240 additions and 283 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1637,7 +1637,8 @@ bool link_has_carrier(Link *link) {
if (link->kernel_operstate == IF_OPER_UNKNOWN)
/* operstate may not be implemented, so fall back to flags */
if ((link->flags & IFF_LOWER_UP) && !(link->flags & IFF_DORMANT))
if (FLAGS_SET(link->flags, IFF_LOWER_UP | IFF_RUNNING) &&
!FLAGS_SET(link->flags, IFF_DORMANT))
return true;
return false;

520
test/test-network/systemd-networkd-tests.py
View File

File diff suppressed because it is too large Load Diff