!49 backport fipvlan: fixup return value on error

From: @liyy9 
Reviewed-by: @Charlie_li 
Signed-off-by: @Charlie_li
This commit is contained in:
openeuler-ci-bot 2023-12-29 03:27:32 +00:00 committed by Gitee
commit 5ee05a293a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,38 @@
From a64563994eb81b68a5b24a82b4c539e407beef52 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 13 May 2014 09:44:17 +0200
Subject: [PATCH] fipvlan: fixup return value on error
fipvlan should return 1 on error or ENODEV (=19) if no interfaces
were found.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
fipvlan.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/fipvlan.c b/fipvlan.c
index 7c00c7c2fec..5fd893eb176 100644
--- a/fipvlan.c
+++ b/fipvlan.c
@@ -983,7 +983,7 @@ int main(int argc, char **argv)
ns = rtnl_socket(RTMGRP_LINK);
if (ns < 0) {
- rc = ns;
+ rc = 1;
goto ns_err;
}
pfd_add(ns);
@@ -1003,7 +1003,7 @@ int main(int argc, char **argv)
"no interfaces to perform discovery on");
else
FIP_LOG("no interfaces to perform discovery on");
- exit(1);
+ exit(ENODEV);
}
do_vlan_discovery();
--
2.33.0

View File

@ -1,6 +1,6 @@
Name: fcoe-utils
Version: 1.0.32
Release: 8
Release: 9
Summary: Fibre Channel over Ethernet utilities
License: GPLv2
URL: https://www.open-fcoe.org
@ -11,6 +11,7 @@ Source3: fcoe.config
Patch0: fcoe-utils-gcc7-fmt-truc-err.patch
Patch1: fcoe-utils-gcc8-fmt-truc-err.patch
Patch2: 0001-fcoe-utils-Fix-get_ctlr_num-for-large-ctlr_-indices.patch
Patch3: 0002-fipvlan-fixup-return-value-on-error.patch
BuildRequires: autoconf automake libpciaccess-devel libtool lldpad-devel systemd
Requires: lldpad iproute device-mapper-multipath
@ -70,6 +71,9 @@ rm -f %{buildroot}/%{_sysconfdir}/fcoe/config
%{_mandir}/man8/*
%changelog
* Thu Dec 28 2023 liyuanyuan <liyuanyuan@xfusion.com> - 1.0.32-9
- fipvlan: fixup return value on error
* Thu Dec 21 2023 liyuanyuan <liyuanyuan@xfusion.com> - 1.0.32-8
- fcoe-utils: Fix get_ctlr_num() for large ctlr_* indices