diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-15 15:37:23 +0200 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2019-04-16 15:56:56 +0200 |
| commit | b9b6e2367f5256b4b95189711f4f5108fde1941b (patch) | |
| tree | 3f8b62e1a0fd507f07842765e7d3d2287ff7c521 | |
| parent | 9865b484faca239686c424afc769e3cd19a76db9 (diff) | |
| download | NetworkManager-b9b6e2367f5256b4b95189711f4f5108fde1941b.tar.gz | |
build: default to internal DHCP client
Meson builds already seem to default this and RHEL & Fedora switched
already. Everyone else also should.
https://github.com/NetworkManager/NetworkManager/pull/345
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 7 insertions, 7 deletions
@@ -10,6 +10,10 @@ USE AT YOUR OWN RISK. NOT RECOMMENDED FOR PRODUCTION USE! * The libnm-glib library, deprecated in favor of libnm since NetworkManager 1.0, and disabled by default since NetworkManager 1.12 has now been removed. +* The DHCP client now defaults to "internal". The default can be overriden + at build time by using the --with-config-dhcp-default option of the + configure script or at run time by setting the main.dhcp option in the + configuration file. ============================================= NetworkManager-1.18 diff --git a/configure.ac b/configure.ac index d080ef760b..fc84edf99b 100644 --- a/configure.ac +++ b/configure.ac @@ -847,15 +847,11 @@ fi AC_ARG_WITH(config-dhcp-default, AS_HELP_STRING([--with-config-dhcp-default=dhclient|dhcpcd|internal], - [Default configuration option for main.dhcp setting, used as fallback if the configuration option is unset]), + [Default configuration option for main.dhcp setting, used as fallback if the configuration option is unset [default=internal]]), [config_dhcp_default="$withval"], [config_dhcp_default=""]) -if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no; then - config_dhcp_default='' +if test "$config_dhcp_default" = yes -o "$config_dhcp_default" = no -o -z "$config_dhcp_default"; then + config_dhcp_default='internal' fi -test -z "$config_dhcp_default" -a "$with_dhcpcanon" != "no" && config_dhcp_default='dhcpcanon' -test -z "$config_dhcp_default" -a "$with_dhclient" != "no" && config_dhcp_default='dhclient' -test -z "$config_dhcp_default" -a "$with_dhcpcd" != "no" && config_dhcp_default='dhcpcd' -test -z "$config_dhcp_default" && config_dhcp_default='internal' AC_DEFINE_UNQUOTED(NM_CONFIG_DEFAULT_MAIN_DHCP, "$config_dhcp_default", [Default configuration option for main.dhcp setting]) AC_SUBST(NM_CONFIG_DEFAULT_MAIN_DHCP, $config_dhcp_default) |