contrib/rpm: change default DHCP plugin to internal

... but keep "dhclient" on Fedora and RHEL <= 7.

https://bugzilla.redhat.com/show_bug.cgi?id=1571655
This commit is contained in:
Thomas Haller 2018-09-03 18:29:12 +02:00
parent 5d3f8a11dd
commit 5ef81dc0fb

View file

@ -101,6 +101,12 @@
%global with_modem_manager_1 0 %global with_modem_manager_1 0
%endif %endif
%if 0%{fedora} || 0%{?rhel} <= 7
%global dhcp_default dhclient
%else
%global dhcp_default internal
%endif
############################################################################### ###############################################################################
Name: NetworkManager Name: NetworkManager
@ -464,7 +470,7 @@ intltoolize --automake --copy --force
--with-dhclient=yes \ --with-dhclient=yes \
--with-dhcpcd=no \ --with-dhcpcd=no \
--with-dhcpcanon=no \ --with-dhcpcanon=no \
--with-config-dhcp-default=dhclient \ --with-config-dhcp-default=%{dhcp_default} \
%if %{with crypto_gnutls} %if %{with crypto_gnutls}
--with-crypto=gnutls \ --with-crypto=gnutls \
%else %else