From 67fb0801eb6fe80e8b76a6bd35a039f5d93421ad Mon Sep 17 00:00:00 2001
From: Thomas Haller <thaller@redhat.com>
Date: Wed, 31 Jul 2019 10:51:58 +0200
Subject: [PATCH 1/1] dhcp: disable nettools DHCP plugin

The "nettools" DHCP plugin one day will replace the systemd-base
implementation and become the "internal" plugin.

The "nettools" plugin is never supposed to become its own plugin. It
later will become the "internal" plugin.

For now, it is undocumented and experimental. For RHEL, patch it out.
This makes also all the code unreachable and the linker removes all
n_dhcp4* symbols.
---
 src/dhcp/nm-dhcp-listener.c | 3 +++
 src/nm-iface-helper.c       | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/src/dhcp/nm-dhcp-listener.c b/src/dhcp/nm-dhcp-listener.c
index 88aafeb0b16d..ce0493aa425e 100644
--- a/src/dhcp/nm-dhcp-listener.c
+++ b/src/dhcp/nm-dhcp-listener.c
@@ -52,7 +52,10 @@ const NMDhcpClientFactory *const _nm_dhcp_manager_factories[5] = {
 	&_nm_dhcp_client_factory_dhcpcd,
 #endif
 	&_nm_dhcp_client_factory_internal,
+#if 0
+	/* Disabled on RHEL */
 	&_nm_dhcp_client_factory_nettools,
+#endif
 };
 
 /*****************************************************************************/
diff --git a/src/nm-iface-helper.c b/src/nm-iface-helper.c
index dd5bb327a0a3..519c7bf1a053 100644
--- a/src/nm-iface-helper.c
+++ b/src/nm-iface-helper.c
@@ -598,7 +598,10 @@ main (int argc, char *argv[])
 
 const NMDhcpClientFactory *const _nm_dhcp_manager_factories[5] = {
 	&_nm_dhcp_client_factory_internal,
+#if 0
+	/* Disabled on RHEL */
 	&_nm_dhcp_client_factory_nettools,
+#endif
 };
 
 /*****************************************************************************/
-- 
2.21.0