5bdc6e9850
- Add two patches for rxe_cfg
* suse-Add-recommends-for-rxe_cfg-requirements.patch
adds recommends for the relevant packages
* rxe-switch-to-iproute2-for-rxe_cfg.patch
switches to iproute2 commands
OBS-URL: https://build.opensuse.org/request/show/630814
OBS-URL: https://build.opensuse.org/package/show/science:HPC/rdma-core?expand=0&rev=94
77 lines
2.1 KiB
Diff
77 lines
2.1 KiB
Diff
commit 310719781cf21b656f2bda440b85634c91093f17
|
|
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
|
Date: Wed Aug 1 14:59:43 2018 +0200
|
|
|
|
rxe: switch to iproute2 for rxe_cfg
|
|
|
|
ifconfig is now deprecated in most distro in favour on iproute2.
|
|
Drop ifconfig support and use iproute2
|
|
|
|
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
|
|
|
diff --git debian/control debian/control
|
|
index 340e8ec96291..2e1c4b835c98 100644
|
|
--- debian/control
|
|
+++ debian/control
|
|
@@ -29,7 +29,7 @@ Depends: lsb-base (>= 3.2-14~),
|
|
${misc:Depends},
|
|
${perl:Depends},
|
|
${shlibs:Depends}
|
|
-Recommends: dmidecode, ethtool, net-tools
|
|
+Recommends: dmidecode, ethtool, iproute2
|
|
Breaks: infiniband-diags (<< 2.0.0)
|
|
Replaces: infiniband-diags (<< 2.0.0)
|
|
Description: RDMA core userspace infrastructure and documentation
|
|
diff --git providers/rxe/rxe_cfg.in providers/rxe/rxe_cfg.in
|
|
index 0a8583da1860..e3956d82b450 100755
|
|
--- providers/rxe/rxe_cfg.in
|
|
+++ providers/rxe/rxe_cfg.in
|
|
@@ -189,22 +189,22 @@ sub get_dev_info {
|
|
$ipv4_addr{$eth} = " ";
|
|
$eth_mtu{$eth} = "";
|
|
|
|
- @lines = `ifconfig $eth`;
|
|
+ @lines = `ip addr show $eth`;
|
|
foreach $line (@lines) {
|
|
- # get IP address
|
|
- if ($line =~ /inet addr/) {
|
|
- $line =~ s/^\s+inet addr://g;
|
|
- @fields = split(/\s+/, $line);
|
|
- $ipv4_addr{$eth} = $fields[0];
|
|
- }
|
|
+ # get IP address
|
|
+ if ($line =~ /inet /) {
|
|
+ $line =~ s/^\s+inet ([0-9.]+)\//$1 /g;
|
|
+ @fields = split(/\s+/, $line);
|
|
+ $ipv4_addr{$eth} = $fields[0];
|
|
+ }
|
|
|
|
- # get ethernet mtu
|
|
- if ($line =~ /MTU:/) {
|
|
- $line =~ s/^.*MTU://g;
|
|
- @fields = split(/\s+/, $line);
|
|
- $eth_mtu{$eth} = $fields[0];
|
|
- }
|
|
- }
|
|
+ # get ethernet mtu
|
|
+ if ($line =~ /mtu /) {
|
|
+ $line =~ s/^.*mtu //g;
|
|
+ @fields = split(/\s+/, $line);
|
|
+ $eth_mtu{$eth} = $fields[0];
|
|
+ }
|
|
+ }
|
|
}
|
|
|
|
# get rxe mtu
|
|
@@ -525,8 +525,8 @@ sub do_start {
|
|
foreach my $rxe (@rxe_array) {
|
|
my $stat = get_devinfo($rxe);
|
|
if ($stat =~ "PORT_DOWN") {
|
|
- my $cmd = "ifconfig $eth_names{$rxe} up";
|
|
- system($cmd);
|
|
+ my $cmd = "ip link set $eth_names{$rxe} up";
|
|
+ system($cmd);
|
|
}
|
|
}
|
|
|