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.
This commit is contained in:
Pavel Šimerda
2012-11-06 18:01:49 +01:00
committed by Dan Williams
parent 9e7eceeca5
commit a52fba46fe

View File

@@ -489,8 +489,6 @@ dhclient_start (NMDHCPClient *client,
g_ptr_array_add (argv, (gpointer) "-6"); g_ptr_array_add (argv, (gpointer) "-6");
if (mode_opt) if (mode_opt)
g_ptr_array_add (argv, (gpointer) mode_opt); g_ptr_array_add (argv, (gpointer) mode_opt);
} else {
g_ptr_array_add (argv, (gpointer) "-4");
} }
#endif #endif