From 28153a7e4791cb68375e359cefb97ae6924f7c5e Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Mon, 23 Apr 2018 18:55:26 +0200 Subject: Rebase patches --- debian/patches/Fix-arping-path.patch | 38 ------------------------------------ 1 file changed, 38 deletions(-) delete mode 100644 debian/patches/Fix-arping-path.patch (limited to 'debian/patches/Fix-arping-path.patch') diff --git a/debian/patches/Fix-arping-path.patch b/debian/patches/Fix-arping-path.patch deleted file mode 100644 index f56e3d8f..00000000 --- a/debian/patches/Fix-arping-path.patch +++ /dev/null @@ -1,38 +0,0 @@ -From: Laurent Bigonville -Date: Mon, 27 Oct 2014 11:08:02 +0100 -Subject: Fix arping path - -Debian provides two arping implementations: -/usr/sbin/arping, shipped by the arping package, -/usr/bin/arping, shipped by the iputils-arping package. - -They aren't completely command line compatible, so we choose the one -which upstream (Fedora) is using, i.e. iputils-arping. - -Closes: #755039 ---- - src/devices/nm-arping-manager.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c -index 51f80e0..3564acc 100644 ---- a/src/devices/nm-arping-manager.c -+++ b/src/devices/nm-arping-manager.c -@@ -223,7 +223,7 @@ nm_arping_manager_start_probe (NMArpingManager *self, guint timeout, GError **er - - priv->completed = 0; - -- argv[0] = nm_utils_find_helper ("arping", NULL, NULL); -+ argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL); - if (!argv[0]) { - g_set_error_literal (error, NM_DEVICE_ERROR, NM_DEVICE_ERROR_FAILED, - "arping could not be found"); -@@ -343,7 +343,7 @@ send_announcements (NMArpingManager *self, const char *mode_arg) - return; - } - -- argv[0] = nm_utils_find_helper ("arping", NULL, NULL); -+ argv[0] = nm_utils_find_helper ("arping", "/usr/bin/arping", NULL); - if (!argv[0]) { - _LOGW ("arping could not be found; no ARPs will be sent"); - return; -- cgit 1.3.0-6-gf8a5