pool/fcoe-utils
SHA256
9
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 791256 from home:lee_duncan:branches:network:fcoe

Browse Source 
- Change use of "ifconfig" to "ip", since ifconfig is no
  longer around (bsc#1073886), adding:
  * fcoe-utils-stop-using-ifconfig.patch

OBS-URL: https://build.opensuse.org/request/show/791256
OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=40
This commit is contained in:
Hannes Reinecke
2020-04-06 06:05:19 +00:00
committed by Git OBS Bridge
parent 87736979a4
commit e1aacbab29
3 changed files with 53 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
fcoe-utils-stop-using-ifconfig.patch Normal file
View File

@@ -0,0 +1,42 @@
diff -aurp fcoe-utils-1.0.32.orig/debug/dcbcheck.sh fcoe-utils-1.0.32/debug/dcbcheck.sh
--- fcoe-utils-1.0.32.orig/debug/dcbcheck.sh 2017-01-17 04:19:20.000000000 -0800
+++ fcoe-utils-1.0.32/debug/dcbcheck.sh 2020-04-02 18:44:06.511563546 -0700
@@ -27,7 +27,7 @@ if [ "${IFNAME}" == "" ] ; then
fi
# Ensure that the interface name provided is valid
-if ifconfig ${IFNAME} 2>&1 | grep -q "Device not found" ; then
+if ip link show dev ${IFNAME} 2>&1 | grep -q "does not exist" ; then
echo "Please provide a valid interface name." >&2
exit 1
fi
Only in fcoe-utils-1.0.32.orig/debug: .dcbcheck.sh.swp
diff -aurp fcoe-utils-1.0.32.orig/debug/fcoedump.sh fcoe-utils-1.0.32/debug/fcoedump.sh
--- fcoe-utils-1.0.32.orig/debug/fcoedump.sh 2017-01-17 04:19:20.000000000 -0800
+++ fcoe-utils-1.0.32/debug/fcoedump.sh 2020-04-02 18:43:46.195599808 -0700
@@ -78,8 +78,10 @@ adapter_info()
ethtool -i $DEVICE
echo -e "#ethtool offloads:"
ethtool -k $DEVICE
- echo -e "#ifconfig:"
- ifconfig $DEVICE
+ echo -e "#ip link:"
+ ip link show dev $DEVICE
+ echo -e "#ip addr:"
+ ip addr show dev $DEVICE
fi
echo -e "\n###Adapter INFO $PHYSDEV"
@@ -93,8 +95,10 @@ adapter_info()
ethtool -k $PHYSDEV
echo -e "#ethtool stats:"
ethtool -S $PHYSDEV
- echo -e "#ifconfig:"
- ifconfig $PHYSDEV
+ echo -e "#ip link:"
+ ip link show dev $PHYSDEV
+ echo -e "#ip addr:"
+ ip addr show dev $PHYSDEV
}
dcbtool_info()

7
fcoe-utils.changes
View File

@@ -1,3 +1,10 @@
-------------------------------------------------------------------
Fri Apr 3 01:50:30 UTC 2020 - Lee Duncan <lduncan@suse.com>
- Change use of "ifconfig" to "ip", since ifconfig is no
longer around (bsc#1073886), adding:
* fcoe-utils-stop-using-ifconfig.patch
-------------------------------------------------------------------
Wed Jun 19 11:23:07 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>

6
fcoe-utils.spec
View File

@@ -1,7 +1,7 @@
#
# spec file for package fcoe-utils
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: fcoe-utils
Url: http://www.open-fcoe.org
URL: http://www.open-fcoe.org
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libpciaccess-devel
@@ -45,6 +45,7 @@ Patch6: 0006-fipvlan-fixup-return-value-on-error.patch
Patch8: 0008-Use-correct-socket-for-fcoemon.socket.patch
Patch9: 0009-disable-Werror-building.patch
Patch12: 0012-fcoemon-Retry-fcm_link_getlink-on-EBUSY.patch
Patch15: %{name}-stop-using-ifconfig.patch
# Patches from Fedora
Patch101: fcoe-utils-1.0.29-make.patch
@@ -64,6 +65,7 @@ connections.
%patch8 -p1
%patch9 -p1
%patch12 -p1
%patch15 -p1
%patch101 -p1
%build