diff options
| author | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2019-05-17 10:56:54 +0000 |
| commit | c1d22074139ab0d048a05b5e5116265d099114d6 (patch) | |
| tree | 97977009422d675f8930f97c309b010481289e72 /nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch | |
| parent | 4dc8afe4fd6b18437150129e0a1ecc23c6a1c0b9 (diff) | |
| parent | bc9df0f66110039e495b6debe3a6cda4a1bb0fed (diff) | |
| download | nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.gz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.bz2 nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.lz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.xz nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.tar.zst nixlib-c1d22074139ab0d048a05b5e5116265d099114d6.zip | |
Merge commit 'bc9df0f66110039e495b6debe3a6cda4a1bb0fed'
Diffstat (limited to 'nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch')
| -rw-r--r-- | nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch b/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch index adf70421ed82..58e3fc6dc5dd 100644 --- a/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch +++ b/nixpkgs/pkgs/tools/networking/network-manager/fix-paths.patch @@ -35,12 +35,12 @@ Restart=on-failure --- a/src/devices/nm-device.c +++ b/src/devices/nm-device.c -@@ -12350,14 +12350,14 @@ +@@ -12451,14 +12451,14 @@ nm_device_start_ip_check (NMDevice *self) gw = nm_ip4_config_best_default_route_get (priv->ip_config_4); if (gw) { nm_utils_inet4_ntop (NMP_OBJECT_CAST_IP4_ROUTE (gw)->gateway, buf); - ping_binary = nm_utils_find_helper ("ping", "/usr/bin/ping", NULL); -+ ping_binary = "@inetutils@/bin/ping"; ++ ping_binary = "@iputils@/bin/ping"; log_domain = LOGD_IP4; } } else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) { @@ -48,13 +48,15 @@ if (gw) { nm_utils_inet6_ntop (&NMP_OBJECT_CAST_IP6_ROUTE (gw)->gateway, buf); - ping_binary = nm_utils_find_helper ("ping6", "/usr/bin/ping6", NULL); -+ ping_binary = "@inetutils@/bin/ping"; ++ ping_binary = "@iputils@/bin/ping"; log_domain = LOGD_IP6; } } +diff --git a/src/nm-core-utils.c b/src/nm-core-utils.c +index 6f55e62a7..93721e7fb 100644 --- a/src/nm-core-utils.c +++ b/src/nm-core-utils.c -@@ -421,8 +421,8 @@ +@@ -442,7 +442,7 @@ nm_utils_modprobe (GError **error, gboolean suppress_error_logging, const char * /* construct the argument list */ argv = g_ptr_array_sized_new (4); @@ -63,4 +65,3 @@ g_ptr_array_add (argv, "--use-blacklist"); g_ptr_array_add (argv, (char *) arg1); - va_start (ap, arg1); |