Rebase patches

1 files changed, 18 insertions, 9 deletions

diff --git a/debian/patches/fix-arping-path.patch b/debian/patches/fix-arping-path.patch
index d71f98e1..643fdbe8 100644
--- a/debian/patches/fix-arping-path.patch
+++ b/debian/patches/fix-arping-path.patch
@@ -11,19 +11,28 @@ which upstream (Fedora) is using, i.e. iputils-arping.
 
 Closes: #755039
 ---
- src/devices/nm-device.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ src/devices/nm-arping-manager.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
 
-diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
-index 93782a4..81487e6 100644
---- a/src/devices/nm-device.c
-+++ b/src/devices/nm-device.c
-@@ -6458,7 +6458,7 @@ send_arps (NMDevice *self, const char *mode_arg)
- 	if (num == 0)
+diff --git a/src/devices/nm-arping-manager.c b/src/devices/nm-arping-manager.c
+index dfb20b4..eb8338f 100644
+--- a/src/devices/nm-arping-manager.c
++++ b/src/devices/nm-arping-manager.c
+@@ -202,7 +202,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");
+@@ -317,7 +317,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 (LOGD_DEVICE | LOGD_IP4, "arping could not be found; no ARPs will be sent");
+ 		_LOGW ("arping could not be found; no ARPs will be sent");
  		return;