New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

networkd: fix #2282 #3075

Merged
merged 1 commit into from Apr 21, 2016

Conversation

3 participants
@ssahani
Copy link
Contributor

ssahani commented Apr 20, 2016

Respect DHCP UseRoutes option.

This fixes #2282

@@ -273,7 +273,8 @@ static int dhcp4_address_handler(sd_netlink *rtnl, sd_netlink_message *m,
} else if (r >= 0)
manager_rtnl_process_address(rtnl, m, link->manager);

link_set_dhcp_routes(link);
if (link->network->dhcp_use_routes)
link_set_dhcp_routes(link);

This comment has been minimized.

@poettering

poettering Apr 20, 2016

Member

I think it would be nicer to move the if check into link_set_dhcp_routes(). i.e. check the bool there, and exit early if it isn't set.

assert(link->network);

if (!link->network->dhcp_use_routes)
return 0;

This comment has been minimized.

@poettering

poettering Apr 20, 2016

Member

Please use 8ch indenting...

@poettering

This comment has been minimized.

Copy link
Member

poettering commented Apr 20, 2016

Whitespace is borked, looks great otherwise!

networkd: fix #2282
Respect DHCP UseRoutes option.

This fixes 2282

@ssahani ssahani force-pushed the ssahani:dhcp-route branch from 1cc96ed to 5186769 Apr 20, 2016

@keszybz keszybz merged commit 964b26f into systemd:master Apr 21, 2016

4 checks passed

semaphoreci The build passed on Semaphore.
Details
ubuntu-amd64 autopkgtest finished (success)
Details
ubuntu-i386 autopkgtest finished (success)
Details
ubuntu-s390x autopkgtest finished (success)
Details

@ssahani ssahani deleted the ssahani:dhcp-route branch Apr 21, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment