rpms/iproute
7
0
Fork 0
Code Issues Pull Requests Releases Activity

iproute-6.14.0-2.el10

Browse Source 
* Sun Jun 22 2025 Andrea Claudi <aclaudi@redhat.com> - 6.14.0-2.el10
- Fix configuration when upgrading from non-stateless config (Andrea Claudi) [RHEL-99163]
Resolves: RHEL-99163

Signed-off-by: Andrea Claudi <aclaudi@redhat.com>
This commit is contained in:
Andrea Claudi 2025-06-23 00:06:54 +02:00
parent 2b249b5aab
commit 4269680565
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
README.etc Normal file
View File

@ -0,0 +1,16 @@
You are looking for your iproute2 config in /etc/iproute2 and it's gone?
Here's an explanation on what's going on:
From v6.5.0, iproute2 supports stateless configuration pattern. This
means that iproute2 now read its config from /etc/iproute2/FOO, and,
if it does not exist, fall back to /usr/share/iproute2/FOO.
You can find iproute2 default configuration in /usr/share/iproute2,
while you can store your user-modified config files in /etc/iproute2.
/usr/share/iproute2 files are not supposed to be manually modified.
If a previous update broke your user config for iproute2, you may
have one or more ".rpmsave" files in /etc/iproute2. You can restore
your config simply dropping the ".rpmsave" suffix from the file name.

18
iproute.spec
View File

@ -5,6 +5,7 @@ Release: %autorelease
URL: https://kernel.org/pub/linux/utils/net/%{name}2/
Source0: https://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.xz
Source1: rt_dsfield.deprecated
Source2: README.etc
License: GPL-2.0-or-later AND NIST-PD
BuildRequires: bison
@ -93,9 +94,23 @@ rm -rf '%{buildroot}%{_docdir}'
# append deprecated values to rt_dsfield for compatibility reasons
%if 0%{?rhel}
cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield
mkdir -p %{buildroot}%{_sysconfdir}/iproute2
cp %{SOURCE2} %{buildroot}%{_sysconfdir}/iproute2/README
cp %{SOURCE2} %{buildroot}%{_datadir}/iproute2/README
%endif
# RHEL-94662: restore /etc/iproute2 conf files, if modified
# this is safe because we don't have conf files in /etc/iproute2 anymore, so
# every *.rpmsave file over there is a leftover from a failed conf upgrade
%posttrans
if [ -f /etc/iproute2/*rpmsave ]; then
for conffile in /etc/iproute2/*rpmsave; do
mv $conffile ${conffile%.rpmsave}
done
fi
%files
%dir %{_sysconfdir}/iproute2
%dir %{_datadir}/iproute2
%license COPYING
%doc README README.devel
@ -105,8 +120,9 @@ cat %{SOURCE1} >>%{buildroot}%{_datadir}/iproute2/rt_dsfield
%exclude %{_mandir}/man8/tc*
%exclude %{_mandir}/man8/cbq*
%exclude %{_mandir}/man8/arpd*
%attr(644,root,root) %config(noreplace) %{_datadir}/iproute2/*
%attr(644,root,root) %config %{_datadir}/iproute2/*
%{_sbindir}/*
%attr(644,root,root) %{_sysconfdir}/iproute2/*
%exclude %{_sbindir}/tc
%exclude %{_sbindir}/routel
%{_datadir}/bash-completion/completions/devlink