Backport fix for ip link add name regression that broke libvirt
Used to work in 3.14, broken in 3.16. Fix already upstream. Libvirt does this when adding a veth pair: # ip link add vnet18 type veth peer name vnet19 Error: argument "vnet18" is wrong: Unknown device
This commit is contained in:
parent
85670bd4c0
commit
0bc5d2c911
@ -2,7 +2,7 @@
|
|||||||
Summary: Advanced IP routing and network device configuration tools
|
Summary: Advanced IP routing and network device configuration tools
|
||||||
Name: iproute
|
Name: iproute
|
||||||
Version: 3.16.0
|
Version: 3.16.0
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
|
URL: http://kernel.org/pub/linux/utils/net/%{name}2/
|
||||||
Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz
|
Source0: http://kernel.org/pub/linux/utils/net/%{name}2/%{name}2-%{version}.tar.gz
|
||||||
@ -19,6 +19,7 @@ Patch6: iproute2-3.12.0-lnstat-dump-to-stdout.patch
|
|||||||
Patch7: iproute2-3.11.0-tc-ok.patch
|
Patch7: iproute2-3.11.0-tc-ok.patch
|
||||||
Patch8: iproute2-3.11.0-rtt.patch
|
Patch8: iproute2-3.11.0-rtt.patch
|
||||||
Patch9: iproute2-3.12.0-lnstat-interval.patch
|
Patch9: iproute2-3.12.0-lnstat-interval.patch
|
||||||
|
Patch10: iproute2-3.16.0-ip-link-add-name.patch
|
||||||
License: GPLv2+ and Public Domain
|
License: GPLv2+ and Public Domain
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: flex
|
BuildRequires: flex
|
||||||
@ -72,6 +73,7 @@ The libnetlink static library.
|
|||||||
%patch7 -p1 -b .tc_ok
|
%patch7 -p1 -b .tc_ok
|
||||||
%patch8 -p1 -b .rtt
|
%patch8 -p1 -b .rtt
|
||||||
%patch9 -p1 -b .lnstat-interval
|
%patch9 -p1 -b .lnstat-interval
|
||||||
|
%patch10 -p1 -b .ip-link-add-name
|
||||||
sed -i 's/^LIBDIR=/LIBDIR?=/' Makefile
|
sed -i 's/^LIBDIR=/LIBDIR?=/' Makefile
|
||||||
|
|
||||||
%build
|
%build
|
||||||
@ -174,6 +176,9 @@ done
|
|||||||
%{_includedir}/libnetlink.h
|
%{_includedir}/libnetlink.h
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sat Oct 04 2014 Lubomir Rintel <lkundrak@v3.sk> - 3.16.0-3
|
||||||
|
- Backport fix for ip link add name regression that broke libvirt
|
||||||
|
|
||||||
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.16.0-2
|
* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.16.0-2
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
|
||||||
|
|
||||||
|
35
iproute2-3.16.0-ip-link-add-name.patch
Normal file
35
iproute2-3.16.0-ip-link-add-name.patch
Normal file
@ -0,0 +1,35 @@
|
|||||||
|
From f1b66ff83a0babbe99fef81b3a960d7a4ce8dbc6 Mon Sep 17 00:00:00 2001
|
||||||
|
From: vadimk <vadim4j@gmail.com>
|
||||||
|
Date: Sat, 30 Aug 2014 15:06:00 +0300
|
||||||
|
Subject: [PATCH] ip link: Remove unnecessary device checking
|
||||||
|
|
||||||
|
The real checking is performed later in iplink_modify(..) func which
|
||||||
|
checks device existence if NLM_F_CREATE flag is set.
|
||||||
|
|
||||||
|
Also it fixes the case when impossible to add veth link which was
|
||||||
|
caused by 9a02651a87 (ip: check for missing dev arg when doing VF rate)
|
||||||
|
because these devices are not exist yet.
|
||||||
|
|
||||||
|
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
|
||||||
|
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
|
||||||
|
Signed-off-by: Stephen Hemminger <stephen@networkplumber.org>
|
||||||
|
---
|
||||||
|
ip/iplink.c | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/ip/iplink.c b/ip/iplink.c
|
||||||
|
index 1a907d9..ea06871 100644
|
||||||
|
--- a/ip/iplink.c
|
||||||
|
+++ b/ip/iplink.c
|
||||||
|
@@ -593,8 +593,6 @@ int iplink_parse(int argc, char **argv, struct iplink_req *req,
|
||||||
|
duparg2("dev", *argv);
|
||||||
|
*dev = *argv;
|
||||||
|
dev_index = ll_name_to_index(*dev);
|
||||||
|
- if (dev_index == 0)
|
||||||
|
- invarg("Unknown device", *argv);
|
||||||
|
}
|
||||||
|
argc--; argv++;
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.1.0
|
||||||
|
|
Loading…
Reference in New Issue
Block a user