@@ -1,8 +1,8 @@
11diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
2−index e398cb9f2f..a43d61864f 100644
2+index 148acade5c..6395fbfbe5 100644
33--- a/data/84-nm-drivers.rules
44+++ b/data/84-nm-drivers.rules
5−@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
5+@@ -7,6 +7,6 @@ ACTION!="add|change|move", GOTO="nm_drivers_end"
66 # Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
77 ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
88 DRIVERS=="?*", GOTO="nm_drivers_end"
@@ -24,19 +24,19 @@ index e23b3a5282..c7246a3b61 100644
2424 ExecStart=@sbindir@/NetworkManager --no-daemon
2525 Restart=on-failure
2626diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
27−index 21863b9533..c9b709659d 100644
27+index a11486d54b..de8e9022c6 100644
2828--- a/src/core/devices/nm-device.c
2929+++ b/src/core/devices/nm-device.c
30−@@ -13994,14 +13994,14 @@ nm_device_start_ip_check(NMDevice *self)
31− gw = nm_ip4_config_best_default_route_get(priv->ip_config_4);
30+@@ -13571,14 +13571,14 @@ nm_device_start_ip_check(NMDevice *self)
31+ gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET);
3232 if (gw) {
3333 _nm_utils_inet4_ntop(NMP_OBJECT_CAST_IP4_ROUTE(gw)->gateway, buf);
3434- ping_binary = nm_utils_find_helper("ping", "/usr/bin/ping", NULL);
3535+ ping_binary = "@iputils@/bin/ping";
3636 log_domain = LOGD_IP4;
3737 }
38− } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
39− gw = nm_ip6_config_best_default_route_get(priv->ip_config_6);
38+ } else if (priv->ip_data_6.state == NM_DEVICE_IP_STATE_READY) {
39+ gw = nm_l3_config_data_get_best_default_route(l3cd, AF_INET6);
4040 if (gw) {
4141 _nm_utils_inet6_ntop(&NMP_OBJECT_CAST_IP6_ROUTE(gw)->gateway, buf);
4242- ping_binary = nm_utils_find_helper("ping6", "/usr/bin/ping6", NULL);
@@ -65,10 +65,10 @@ index 21a01e0b04..091c98428f 100644
6565 '--lib-path', meson.current_build_dir(),
6666 '--gir', '@INPUT@',
6767diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c
68−index 6435dcc482..214d01194e 100644
68+index 9ad030df76..8d800fb1c0 100644
6969--- a/src/libnm-platform/nm-platform-utils.c
7070+++ b/src/libnm-platform/nm-platform-utils.c
71−@@ -2097,7 +2097,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *
71+@@ -2207,7 +2207,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *
7272
7373 /* construct the argument list */
7474 argv = g_ptr_array_sized_new(4);
@@ -78,13 +78,13 @@ index 6435dcc482..214d01194e 100644
7878 g_ptr_array_add(argv, (char *) arg1);
7979
8080diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
81−index 72691e34c2..95495b6585 100644
81+index e2c0c394bd..1a507aa0d4 100644
8282--- a/src/libnmc-base/nm-vpn-helpers.c
8383+++ b/src/libnmc-base/nm-vpn-helpers.c
8484@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host,
8585 gs_free const char **output_v = NULL;
86− const char *const * iter;
87− const char * path;
86+ const char *const *iter;
87+ const char *path;
8888- const char *const DEFAULT_PATHS[] = {
8989- "/sbin/",
9090- "/usr/sbin/",