diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-10-07 16:41:46 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-11-01 07:49:03 +0100 |
| commit | ef159046e0483a5fae52accc4554edfb1b9b3687 (patch) | |
| tree | 6073f763e9e17a3a40a745568115aeafcd94f516 | |
| parent | e1ead6fa984db411db8c8cfcc1e1cf16e110ce3e (diff) | |
| download | NetworkManager-th/nettools-n-dhcp4-as-internal-plugin.tar.gz | |
dhcp: switch IPv4 "internal" DHCP client to use "nettools" backend instead of "systemd"th/nettools-n-dhcp4-as-internal-plugin
Previously, our "internal" DHCPv4 client is based on a fork of
systemd code. This manner of maintaining the fork is problematic.
The solution is to use a proper library: n-dhcp4 from the nettools
project.
We already have these two as undocumented plugins available, by
setting either "dhcp=systemd" or "dhcp=nettools". This is only for
testing. Users are only supposed to use the "internal" plugin.
Up until now, the "internal" DHCPv4 plugin was based on "systemd" code.
Change that to use "nettools" instead.
Possibly this breaks something, and we need to fix it. But do this
early so we have time to test the nettools plugin and identify issues.
For the user, this change should be entirely transparant.
| -rw-r--r-- | src/dhcp/nm-dhcp-systemd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dhcp/nm-dhcp-systemd.c b/src/dhcp/nm-dhcp-systemd.c index 7f0cd3325e..90358def26 100644 --- a/src/dhcp/nm-dhcp-systemd.c +++ b/src/dhcp/nm-dhcp-systemd.c @@ -1095,7 +1095,7 @@ _get_type_per_addr_family (int addr_family) { nm_assert_addr_family (addr_family); - if (FALSE && addr_family == AF_INET) + if (addr_family == AF_INET) return nm_dhcp_nettools_get_type (); return nm_dhcp_systemd_get_type (); } |