fcoe-utils/0006-fipvlan-fixup-return-value-on-error.patch

39 lines
877 B
Diff
Raw Normal View History

- Update to version 1.0.30 (FATE#318849) * Remove merged patches: + 0001-man-Fix-small-typo-regarding-fcf-option.patch + 0002-Don-t-call-AM_INIT_AUTOMAKE-twice.patch + 0003-fipvlan-fails-on-powerpc.patch + 0004-fipvlan-Only-shutdown-interfaces-if-no-vlans-are-cre.patch + 0005-fipvlan-start-VLAN-interface-from-netlink-handler.patch + 0006-fipvlan-Extract-create_missing_vlan-function-from-lo.patch + 0007-fipvlan-create-VLANs-from-netlink-handler.patch + 0008-fipvlan-Start-FCoE-from-netlink-handler.patch + 0009-fipvlan-Update-wait-loop-to-wait-for-VLANs.patch + 0010-fipvlan-Re-send-VLAN-discovery.patch + 0011-fipvlan-update-manpage.patch + 0012-fipvlan-Leave-link-up-if-requested.patch + 0013-fipvlan-Update-manpage-to-reflect-correct-timeout.patch + 0014-fipvlan-Do-not-shut-down-FCoE-connections-on-physica.patch + 0015-fipvlan-break-out-of-receive-loop-on-error.patch + 0016-fipvlan-handle-errors-from-fip-socket-creation.patch + 0017-fipvlan-filter-interfaces-from-rtnl_getlink.patch + 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch + 0019-Fix-build-with-Wl-as-needed.patch + 0020-Fix-integer-formatting.patch + 0021-fcnsq-Fixup-help-text.patch + 0022-fcnsq-Fixup-64bit-integer-handling.patch + 0023-fcoemon-add-systemd-service-file.patch + 0024-fcoemon-systemd-socket-activation.patch + 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch + 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch + 0027-man-Fix-typo-in-fcoemon-documentation.patch + 0032-fipvlan-Fix-crash-in-create_and_start_vlan.patch OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=22
2015-08-04 12:18:41 +02:00
From 311c26a073f4397f10408c288af28cf593f46336 Mon Sep 17 00:00:00 2001
From: Hannes Reinecke <hare@suse.de>
Date: Tue, 13 May 2014 09:44:17 +0200
Subject: 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
- Update to version 1.0.30 (FATE#318849) * Remove merged patches: + 0001-man-Fix-small-typo-regarding-fcf-option.patch + 0002-Don-t-call-AM_INIT_AUTOMAKE-twice.patch + 0003-fipvlan-fails-on-powerpc.patch + 0004-fipvlan-Only-shutdown-interfaces-if-no-vlans-are-cre.patch + 0005-fipvlan-start-VLAN-interface-from-netlink-handler.patch + 0006-fipvlan-Extract-create_missing_vlan-function-from-lo.patch + 0007-fipvlan-create-VLANs-from-netlink-handler.patch + 0008-fipvlan-Start-FCoE-from-netlink-handler.patch + 0009-fipvlan-Update-wait-loop-to-wait-for-VLANs.patch + 0010-fipvlan-Re-send-VLAN-discovery.patch + 0011-fipvlan-update-manpage.patch + 0012-fipvlan-Leave-link-up-if-requested.patch + 0013-fipvlan-Update-manpage-to-reflect-correct-timeout.patch + 0014-fipvlan-Do-not-shut-down-FCoE-connections-on-physica.patch + 0015-fipvlan-break-out-of-receive-loop-on-error.patch + 0016-fipvlan-handle-errors-from-fip-socket-creation.patch + 0017-fipvlan-filter-interfaces-from-rtnl_getlink.patch + 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch + 0019-Fix-build-with-Wl-as-needed.patch + 0020-Fix-integer-formatting.patch + 0021-fcnsq-Fixup-help-text.patch + 0022-fcnsq-Fixup-64bit-integer-handling.patch + 0023-fcoemon-add-systemd-service-file.patch + 0024-fcoemon-systemd-socket-activation.patch + 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch + 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch + 0027-man-Fix-typo-in-fcoemon-documentation.patch + 0032-fipvlan-Fix-crash-in-create_and_start_vlan.patch OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=22
2015-08-04 12:18:41 +02:00
index 288b011..9f3b07d 100644
--- a/fipvlan.c
+++ b/fipvlan.c
- Update to version 1.0.30 (FATE#318849) * Remove merged patches: + 0001-man-Fix-small-typo-regarding-fcf-option.patch + 0002-Don-t-call-AM_INIT_AUTOMAKE-twice.patch + 0003-fipvlan-fails-on-powerpc.patch + 0004-fipvlan-Only-shutdown-interfaces-if-no-vlans-are-cre.patch + 0005-fipvlan-start-VLAN-interface-from-netlink-handler.patch + 0006-fipvlan-Extract-create_missing_vlan-function-from-lo.patch + 0007-fipvlan-create-VLANs-from-netlink-handler.patch + 0008-fipvlan-Start-FCoE-from-netlink-handler.patch + 0009-fipvlan-Update-wait-loop-to-wait-for-VLANs.patch + 0010-fipvlan-Re-send-VLAN-discovery.patch + 0011-fipvlan-update-manpage.patch + 0012-fipvlan-Leave-link-up-if-requested.patch + 0013-fipvlan-Update-manpage-to-reflect-correct-timeout.patch + 0014-fipvlan-Do-not-shut-down-FCoE-connections-on-physica.patch + 0015-fipvlan-break-out-of-receive-loop-on-error.patch + 0016-fipvlan-handle-errors-from-fip-socket-creation.patch + 0017-fipvlan-filter-interfaces-from-rtnl_getlink.patch + 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch + 0019-Fix-build-with-Wl-as-needed.patch + 0020-Fix-integer-formatting.patch + 0021-fcnsq-Fixup-help-text.patch + 0022-fcnsq-Fixup-64bit-integer-handling.patch + 0023-fcoemon-add-systemd-service-file.patch + 0024-fcoemon-systemd-socket-activation.patch + 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch + 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch + 0027-man-Fix-typo-in-fcoemon-documentation.patch + 0032-fipvlan-Fix-crash-in-create_and_start_vlan.patch OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=22
2015-08-04 12:18:41 +02:00
@@ -981,7 +981,7 @@ int main(int argc, char **argv)
ns = rtnl_socket();
if (ns < 0) {
- rc = ns;
+ rc = 1;
goto ns_err;
}
pfd_add(ns);
- Update to version 1.0.30 (FATE#318849) * Remove merged patches: + 0001-man-Fix-small-typo-regarding-fcf-option.patch + 0002-Don-t-call-AM_INIT_AUTOMAKE-twice.patch + 0003-fipvlan-fails-on-powerpc.patch + 0004-fipvlan-Only-shutdown-interfaces-if-no-vlans-are-cre.patch + 0005-fipvlan-start-VLAN-interface-from-netlink-handler.patch + 0006-fipvlan-Extract-create_missing_vlan-function-from-lo.patch + 0007-fipvlan-create-VLANs-from-netlink-handler.patch + 0008-fipvlan-Start-FCoE-from-netlink-handler.patch + 0009-fipvlan-Update-wait-loop-to-wait-for-VLANs.patch + 0010-fipvlan-Re-send-VLAN-discovery.patch + 0011-fipvlan-update-manpage.patch + 0012-fipvlan-Leave-link-up-if-requested.patch + 0013-fipvlan-Update-manpage-to-reflect-correct-timeout.patch + 0014-fipvlan-Do-not-shut-down-FCoE-connections-on-physica.patch + 0015-fipvlan-break-out-of-receive-loop-on-error.patch + 0016-fipvlan-handle-errors-from-fip-socket-creation.patch + 0017-fipvlan-filter-interfaces-from-rtnl_getlink.patch + 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch + 0019-Fix-build-with-Wl-as-needed.patch + 0020-Fix-integer-formatting.patch + 0021-fcnsq-Fixup-help-text.patch + 0022-fcnsq-Fixup-64bit-integer-handling.patch + 0023-fcoemon-add-systemd-service-file.patch + 0024-fcoemon-systemd-socket-activation.patch + 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch + 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch + 0027-man-Fix-typo-in-fcoemon-documentation.patch + 0032-fipvlan-Fix-crash-in-create_and_start_vlan.patch OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=22
2015-08-04 12:18:41 +02:00
@@ -1001,7 +1001,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();
--
- Update to version 1.0.30 (FATE#318849) * Remove merged patches: + 0001-man-Fix-small-typo-regarding-fcf-option.patch + 0002-Don-t-call-AM_INIT_AUTOMAKE-twice.patch + 0003-fipvlan-fails-on-powerpc.patch + 0004-fipvlan-Only-shutdown-interfaces-if-no-vlans-are-cre.patch + 0005-fipvlan-start-VLAN-interface-from-netlink-handler.patch + 0006-fipvlan-Extract-create_missing_vlan-function-from-lo.patch + 0007-fipvlan-create-VLANs-from-netlink-handler.patch + 0008-fipvlan-Start-FCoE-from-netlink-handler.patch + 0009-fipvlan-Update-wait-loop-to-wait-for-VLANs.patch + 0010-fipvlan-Re-send-VLAN-discovery.patch + 0011-fipvlan-update-manpage.patch + 0012-fipvlan-Leave-link-up-if-requested.patch + 0013-fipvlan-Update-manpage-to-reflect-correct-timeout.patch + 0014-fipvlan-Do-not-shut-down-FCoE-connections-on-physica.patch + 0015-fipvlan-break-out-of-receive-loop-on-error.patch + 0016-fipvlan-handle-errors-from-fip-socket-creation.patch + 0017-fipvlan-filter-interfaces-from-rtnl_getlink.patch + 0018-Add-missing-DESTDIR-when-installing-bash-completion.patch + 0019-Fix-build-with-Wl-as-needed.patch + 0020-Fix-integer-formatting.patch + 0021-fcnsq-Fixup-help-text.patch + 0022-fcnsq-Fixup-64bit-integer-handling.patch + 0023-fcoemon-add-systemd-service-file.patch + 0024-fcoemon-systemd-socket-activation.patch + 0025-doc-Update-QUICKSTART-INSTALL-docs-for-systemd-init-.patch + 0026-FIPVLAN-Really-break-out-of-the-recv_loop-upon-fip_r.patch + 0027-man-Fix-typo-in-fcoemon-documentation.patch + 0032-fipvlan-Fix-crash-in-create_and_start_vlan.patch OBS-URL: https://build.opensuse.org/package/show/network:fcoe/fcoe-utils?expand=0&rev=22
2015-08-04 12:18:41 +02:00
1.8.4.5