Revert OL modifications
This commit is contained in:
parent
3611c44218
commit
1c9b66e22d
|
|
@ -1,3 +0,0 @@
|
|||
# This is the config setting to disable NetworkManager's MPTCP handling by default.
|
||||
[connection.no-mptcp]
|
||||
connection.mptcp-flags=0x1
|
||||
|
|
@ -5,6 +5,6 @@
|
|||
# strict. Check "/proc/sys/net/ipv4/conf/*/rp_filter".
|
||||
[connectivity]
|
||||
enabled=true
|
||||
uri=http://yum.oracle.com/static/oracle-networkmanager.txt
|
||||
uri=http://static.redhat.com/test/rhel-networkmanager.txt
|
||||
response=OK
|
||||
interval=300
|
||||
|
|
@ -81,9 +81,9 @@
|
|||
%bcond_with connectivity_fedora
|
||||
%endif
|
||||
%if 0%{?rhel} && 0%{?rhel} >= 8
|
||||
%bcond_without connectivity_oracle
|
||||
%bcond_without connectivity_redhat
|
||||
%else
|
||||
%bcond_with connectivity_oracle
|
||||
%bcond_with connectivity_redhat
|
||||
%endif
|
||||
%if 0%{?fedora} >= 29 || 0%{?rhel} >= 8
|
||||
%bcond_without crypto_gnutls
|
||||
|
|
@ -183,7 +183,7 @@ Name: NetworkManager
|
|||
Summary: Network connection manager and user applications
|
||||
Epoch: %{epoch_version}
|
||||
Version: %{rpm_version}
|
||||
Release: %{release_version}%{?snap}.0.1%{?dist}
|
||||
Release: %{release_version}%{?snap}%{?dist}
|
||||
Group: System Environment/Base
|
||||
License: GPLv2+ and LGPLv2+
|
||||
URL: https://networkmanager.dev/
|
||||
|
|
@ -192,12 +192,9 @@ Source: https://download.gnome.org/sources/NetworkManager/%{real_version_major}/
|
|||
Source1: NetworkManager.conf
|
||||
Source2: 00-server.conf
|
||||
Source4: 20-connectivity-fedora.conf
|
||||
Source5: 20-connectivity-oracle.conf
|
||||
Source5: 20-connectivity-redhat.conf
|
||||
Source6: 70-nm-connectivity.conf
|
||||
Source7: readme-ifcfg-rh.txt
|
||||
# As for now we are disabling MPTCP on Oracle Linux by default
|
||||
# This may change in future
|
||||
Source8: 10-disable-mptcp.conf
|
||||
|
||||
# RHEL downstream patches that change behavior from upstream.
|
||||
# These are not bugfixes, hence they are also relevant after
|
||||
|
|
@ -515,18 +512,16 @@ via Fedora infrastructure.
|
|||
%endif
|
||||
|
||||
|
||||
%if %{with connectivity_oracle}
|
||||
%package config-connectivity-oracle
|
||||
Summary: NetworkManager config file for connectivity checking via Oracle servers
|
||||
%if %{with connectivity_redhat}
|
||||
%package config-connectivity-redhat
|
||||
Summary: NetworkManager config file for connectivity checking via Red Hat servers
|
||||
Group: System Environment/Base
|
||||
BuildArch: noarch
|
||||
Provides: NetworkManager-config-connectivity = %{epoch}:%{version}-%{release}
|
||||
Provides: NetworkManager-config-connectivity-redhat
|
||||
Obsoletes: NetworkManager-config-connectivity-redhat
|
||||
|
||||
%description config-connectivity-oracle
|
||||
%description config-connectivity-redhat
|
||||
This adds a NetworkManager configuration file to enable connectivity checking
|
||||
via Oracle infrastructure.
|
||||
via Red Hat infrastructure.
|
||||
%endif
|
||||
|
||||
|
||||
|
|
@ -912,14 +907,11 @@ cp %{SOURCE1} %{buildroot}%{_sysconfdir}/%{name}/
|
|||
|
||||
cp %{SOURCE2} %{buildroot}%{nmlibdir}/conf.d/
|
||||
|
||||
#copying the config to disable MPTCP
|
||||
cp %{SOURCE8} %{buildroot}%{nmlibdir}/conf.d/
|
||||
|
||||
%if %{with connectivity_fedora}
|
||||
cp %{SOURCE4} %{buildroot}%{nmlibdir}/conf.d/
|
||||
%endif
|
||||
|
||||
%if %{with connectivity_oracle}
|
||||
%if %{with connectivity_redhat}
|
||||
cp %{SOURCE5} %{buildroot}%{nmlibdir}/conf.d/
|
||||
mkdir -p %{buildroot}%{_sysctldir}
|
||||
cp %{SOURCE6} %{buildroot}%{_sysctldir}
|
||||
|
|
@ -1073,7 +1065,6 @@ fi
|
|||
%dir %{_sysconfdir}/%{name}/dnsmasq-shared.d
|
||||
%dir %{_sysconfdir}/%{name}/system-connections
|
||||
%config(noreplace) %{_sysconfdir}/%{name}/NetworkManager.conf
|
||||
%config %{nmlibdir}/conf.d/10-disable-mptcp.conf
|
||||
%ghost %{_sysconfdir}/%{name}/VPN
|
||||
%{_bindir}/nm-online
|
||||
%{_libexecdir}/nm-dhcp-helper
|
||||
|
|
@ -1205,11 +1196,11 @@ fi
|
|||
%endif
|
||||
|
||||
|
||||
%if %{with connectivity_oracle}
|
||||
%files config-connectivity-oracle
|
||||
%if %{with connectivity_redhat}
|
||||
%files config-connectivity-redhat
|
||||
%dir %{nmlibdir}
|
||||
%dir %{nmlibdir}/conf.d
|
||||
%{nmlibdir}/conf.d/20-connectivity-oracle.conf
|
||||
%{nmlibdir}/conf.d/20-connectivity-redhat.conf
|
||||
%{_sysctldir}/70-nm-connectivity.conf
|
||||
%endif
|
||||
|
||||
|
|
@ -1262,11 +1253,6 @@ fi
|
|||
|
||||
|
||||
%changelog
|
||||
* Wed Jun 21 2023 EL Errata <el-errata_ww@oracle.com> - 1.42.2-3.0.1
|
||||
- disable MPTCP handling by default [Orabug: 34801142]
|
||||
- add connectivity check via Oracle servers [Orabug: 32051972]
|
||||
- Disable the build of NetworkManager-config-connectivity-* subpackage for 9.0
|
||||
|
||||
* Mon May 29 2023 Wen Liang <wenliang@redhat.com> - 1:1.42.2-3
|
||||
- revert "infiniband: avoid normalizing the p-key when reading from ifcfg" (rh #2209976)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue