summaryrefslogtreecommitdiff
path: root/src/devices
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2015-11-24 10:20:13 +0100
committerJiří Klimeš <jklimes@redhat.com>2015-11-24 14:35:46 +0100
commita261e9c3e57ca22d979d9484e23ea0d1440f6dd0 (patch)
tree8b86c33b6f523897fdb3e5791e8c39d218fdf28f /src/devices
parent1e7d952731a39e71947ee0bfc3cd0dfcb9015caa (diff)
device: use nm_utils_find_helper() to find out ping/ping6 binary (bgo #758566)
https://bugzilla.gnome.org/show_bug.cgi?id=758566 (cherry picked from commit 795a3943ea5276d8ebe85ad211a0cc9309f9ea48)
Diffstat (limited to 'src/devices')
-rw-r--r--src/devices/nm-device.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/devices/nm-device.c b/src/devices/nm-device.c
index 9b69d5abef..bb39ca5546 100644
--- a/src/devices/nm-device.c
+++ b/src/devices/nm-device.c
@@ -7007,7 +7007,7 @@ nm_device_start_ip_check (NMDevice *self)
if (priv->ip4_config && priv->ip4_state == IP_DONE) {
guint gw = 0;
- ping_binary = "/usr/bin/ping";
+ ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL);
log_domain = LOGD_IP4;
gw = nm_ip4_config_get_gateway (priv->ip4_config);
@@ -7016,7 +7016,7 @@ nm_device_start_ip_check (NMDevice *self)
} else if (priv->ip6_config && priv->ip6_state == IP_DONE) {
const struct in6_addr *gw = NULL;
- ping_binary = "/usr/bin/ping6";
+ ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL);
log_domain = LOGD_IP6;
gw = nm_ip6_config_get_gateway (priv->ip6_config);