From a52fba46fecd214ad1ae3378c44328565240776a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pavel=20=C5=A0imerda?= Date: Tue, 6 Nov 2012 18:01:49 +0100 Subject: [PATCH] dhcp: do not require dhclient to support '-4' option (bgo #679428) dhclient only supports '-4' option when built with IPv6 support. In all cases it defaults to IPv4 when it is not specified. Inspired by Gentoo. --- src/dhcp-manager/nm-dhcp-dhclient.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/dhcp-manager/nm-dhcp-dhclient.c b/src/dhcp-manager/nm-dhcp-dhclient.c index df277a50ea..335b157bfc 100644 --- a/src/dhcp-manager/nm-dhcp-dhclient.c +++ b/src/dhcp-manager/nm-dhcp-dhclient.c @@ -489,8 +489,6 @@ dhclient_start (NMDHCPClient *client, g_ptr_array_add (argv, (gpointer) "-6"); if (mode_opt) g_ptr_array_add (argv, (gpointer) mode_opt); - } else { - g_ptr_array_add (argv, (gpointer) "-4"); } #endif