Skip to content

networkd: don't remove ip address or route - #10597

Merged
poettering merged 2 commits into
systemd:masterfrom
toanju:fix-networkd-l3-loss
Nov 6, 2018
Merged

poettering merged 2 commits into
systemd:masterfrom
toanju:fix-networkd-l3-loss

Conversation

@toanju

@toanju toanju commented Oct 31, 2018

Copy link
Copy Markdown
Contributor

In case networkd is restarted this prevents a removal of an already existing IP
address that would be configured using networkd. With the proposed changes the
IP address will be kept on the interface without removing. This happens only on
physical hosts or VMs since networkd handles interface configuration slightly
different in containers.

@yuwata yuwata added the network label Nov 1, 2018
Comment thread src/network/networkd-address.c Outdated
Comment thread src/network/networkd-link.c Outdated
@toanju
toanju force-pushed the fix-networkd-l3-loss branch 2 times, most recently from 239c8a4 to 2245d5b Compare November 2, 2018 08:28
Comment thread src/network/networkd-link.c Outdated
Comment thread src/network/networkd-link.c Outdated
Comment thread src/network/networkd-link.c Outdated
@toanju
toanju force-pushed the fix-networkd-l3-loss branch from 2245d5b to 3af0203 Compare November 6, 2018 10:30
@toanju

toanju commented Nov 6, 2018

Copy link
Copy Markdown
Contributor Author

I addressed the comments above, please have a look. I did not yet cover the routes so far.

@poettering poettering left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks good, just some minor coding style nitpicks

Comment thread src/network/networkd-link.c Outdated
Comment thread src/network/networkd-link.c Outdated
Comment thread src/network/networkd-link.c Outdated
@toanju
toanju force-pushed the fix-networkd-l3-loss branch from 3af0203 to fbfdeb0 Compare November 6, 2018 12:04
In case networkd is restarted this prevents a removal of an already existing IP
address that would be configured using networkd. With the proposed changes the
IP address will be kept on the interface without removing. This happens only on
physical hosts or VMs since networkd handles interface configuration slightly
different in containers.
@toanju
toanju force-pushed the fix-networkd-l3-loss branch from fbfdeb0 to 30226d2 Compare November 6, 2018 12:26
In case networkd is restarted this prevents a removal of an already existing
route that would be configured using networkd. With the proposed changes the
route will be kept on the interface without removing. This happens only on
physical hosts or VMs since networkd handles interface configuration slightly
different in containers.
@toanju

toanju commented Nov 6, 2018

Copy link
Copy Markdown
Contributor Author

Added a commit to solve the same issue wrt. static routes.

@toanju toanju changed the title networkd: don't remove ip address networkd: don't remove ip address and route Nov 6, 2018
@toanju toanju changed the title networkd: don't remove ip address and route networkd: don't remove ip address or route Nov 6, 2018
@poettering poettering added the good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed label Nov 6, 2018
@poettering

Copy link
Copy Markdown
Member

looks excellent! thanks!

@toanju

toanju commented Nov 6, 2018

Copy link
Copy Markdown
Contributor Author

Thanks for reviewing!

@poettering
poettering merged commit a0ca258 into systemd:master Nov 6, 2018
keszybz pushed a commit to systemd/systemd-stable that referenced this pull request Jan 11, 2019
In case networkd is restarted this prevents a removal of an already existing IP
address that would be configured using networkd. With the proposed changes the
IP address will be kept on the interface without removing. This happens only on
physical hosts or VMs since networkd handles interface configuration slightly
different in containers.

cherry picked from systemd/systemd#10597
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed network

Development

Successfully merging this pull request may close these issues.

3 participants