diff options
| author | Thomas Haller <thaller@redhat.com> | 2018-09-03 18:29:12 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2018-09-03 21:23:47 +0200 |
| commit | 5ef81dc0fbbe41b85abe7929563d41b03eaf6989 (patch) | |
| tree | b64f160d34f8f7cde79cdc6502dba8e25f1e48de /contrib | |
| parent | 5d3f8a11dd2e14a23e1686d313e045181f06bde0 (diff) | |
| download | NetworkManager-5ef81dc0fbbe41b85abe7929563d41b03eaf6989.tar.gz | |
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
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index d23545e9a6..b74cff5d75 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -101,6 +101,12 @@ %global with_modem_manager_1 0 %endif +%if 0%{fedora} || 0%{?rhel} <= 7 +%global dhcp_default dhclient +%else +%global dhcp_default internal +%endif + ############################################################################### Name: NetworkManager @@ -464,7 +470,7 @@ intltoolize --automake --copy --force --with-dhclient=yes \ --with-dhcpcd=no \ --with-dhcpcanon=no \ - --with-config-dhcp-default=dhclient \ + --with-config-dhcp-default=%{dhcp_default} \ %if %{with crypto_gnutls} --with-crypto=gnutls \ %else |