134 lines
5.8 KiB
Diff
134 lines
5.8 KiB
Diff
diff --git a/data/84-nm-drivers.rules b/data/84-nm-drivers.rules
|
|
index e398cb9f2f..a43d61864f 100644
|
|
--- a/data/84-nm-drivers.rules
|
|
+++ b/data/84-nm-drivers.rules
|
|
@@ -7,6 +7,6 @@ ACTION!="add|change", GOTO="nm_drivers_end"
|
|
# Determine ID_NET_DRIVER if there's no ID_NET_DRIVER or DRIVERS (old udev?)
|
|
ENV{ID_NET_DRIVER}=="?*", GOTO="nm_drivers_end"
|
|
DRIVERS=="?*", GOTO="nm_drivers_end"
|
|
-PROGRAM="/bin/sh -c '/usr/sbin/ethtool -i $$1 |/usr/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
|
|
+PROGRAM="@runtimeShell@ -c '@ethtool@/bin/ethtool -i $$1 |@gnused@/bin/sed -n s/^driver:\ //p' -- $env{INTERFACE}", ENV{ID_NET_DRIVER}="%c"
|
|
|
|
LABEL="nm_drivers_end"
|
|
diff --git a/data/NetworkManager.service.in b/data/NetworkManager.service.in
|
|
index e23b3a5282..c7246a3b61 100644
|
|
--- a/data/NetworkManager.service.in
|
|
+++ b/data/NetworkManager.service.in
|
|
@@ -8,7 +8,7 @@ Before=network.target @DISTRO_NETWORK_SERVICE@
|
|
[Service]
|
|
Type=dbus
|
|
BusName=org.freedesktop.NetworkManager
|
|
-ExecReload=/usr/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
|
|
+ExecReload=@systemd@/bin/busctl call org.freedesktop.NetworkManager /org/freedesktop/NetworkManager org.freedesktop.NetworkManager Reload u 0
|
|
#ExecReload=/bin/kill -HUP $MAINPID
|
|
ExecStart=@sbindir@/NetworkManager --no-daemon
|
|
Restart=on-failure
|
|
diff --git a/src/core/devices/nm-device.c b/src/core/devices/nm-device.c
|
|
index 21863b9533..c9b709659d 100644
|
|
--- a/src/core/devices/nm-device.c
|
|
+++ b/src/core/devices/nm-device.c
|
|
@@ -13994,14 +13994,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 = "@iputils@/bin/ping";
|
|
log_domain = LOGD_IP4;
|
|
}
|
|
} else if (priv->ip_config_6 && priv->ip_state_6 == NM_DEVICE_IP_STATE_DONE) {
|
|
gw = nm_ip6_config_best_default_route_get(priv->ip_config_6);
|
|
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 = "@iputils@/bin/ping";
|
|
log_domain = LOGD_IP6;
|
|
}
|
|
}
|
|
diff --git a/src/libnm-client-impl/meson.build b/src/libnm-client-impl/meson.build
|
|
index 21a01e0b04..091c98428f 100644
|
|
--- a/src/libnm-client-impl/meson.build
|
|
+++ b/src/libnm-client-impl/meson.build
|
|
@@ -162,7 +162,6 @@ if enable_introspection
|
|
input: libnm_core_settings_sources,
|
|
output: 'nm-propery-infos-' + info + '.xml',
|
|
command: [
|
|
- python.path(),
|
|
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-property-infos.py'),
|
|
info,
|
|
'@OUTPUT@',
|
|
@@ -219,7 +218,6 @@ if enable_introspection
|
|
'env',
|
|
'GI_TYPELIB_PATH=' + gi_typelib_path,
|
|
'LD_LIBRARY_PATH=' + ld_library_path,
|
|
- python.path(),
|
|
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-gir.py'),
|
|
'--lib-path', meson.current_build_dir(),
|
|
'--gir', '@INPUT@',
|
|
diff --git a/src/libnm-platform/nm-platform-utils.c b/src/libnm-platform/nm-platform-utils.c
|
|
index 6435dcc482..214d01194e 100644
|
|
--- a/src/libnm-platform/nm-platform-utils.c
|
|
+++ b/src/libnm-platform/nm-platform-utils.c
|
|
@@ -2097,7 +2097,7 @@ nmp_utils_modprobe(GError **error, gboolean suppress_error_logging, const char *
|
|
|
|
/* construct the argument list */
|
|
argv = g_ptr_array_sized_new(4);
|
|
- g_ptr_array_add(argv, "/sbin/modprobe");
|
|
+ g_ptr_array_add(argv, "@kmod@/bin/modprobe");
|
|
g_ptr_array_add(argv, "--use-blacklist");
|
|
g_ptr_array_add(argv, (char *) arg1);
|
|
|
|
diff --git a/src/libnmc-base/nm-vpn-helpers.c b/src/libnmc-base/nm-vpn-helpers.c
|
|
index 72691e34c2..95495b6585 100644
|
|
--- a/src/libnmc-base/nm-vpn-helpers.c
|
|
+++ b/src/libnmc-base/nm-vpn-helpers.c
|
|
@@ -198,25 +198,8 @@ nm_vpn_openconnect_authenticate_helper(const char *host,
|
|
gs_free const char **output_v = NULL;
|
|
const char *const * iter;
|
|
const char * path;
|
|
- const char *const DEFAULT_PATHS[] = {
|
|
- "/sbin/",
|
|
- "/usr/sbin/",
|
|
- "/usr/local/sbin/",
|
|
- "/bin/",
|
|
- "/usr/bin/",
|
|
- "/usr/local/bin/",
|
|
- NULL,
|
|
- };
|
|
|
|
- path = nm_utils_file_search_in_paths("openconnect",
|
|
- "/usr/sbin/openconnect",
|
|
- DEFAULT_PATHS,
|
|
- G_FILE_TEST_IS_EXECUTABLE,
|
|
- NULL,
|
|
- NULL,
|
|
- error);
|
|
- if (!path)
|
|
- return FALSE;
|
|
+ path = "@openconnect@/bin/openconnect";
|
|
|
|
if (!g_spawn_sync(NULL,
|
|
(char **) NM_MAKE_STRV(path, "--authenticate", host),
|
|
diff --git a/src/libnmc-setting/meson.build b/src/libnmc-setting/meson.build
|
|
index 8f07ae634e..a1326b3403 100644
|
|
--- a/src/libnmc-setting/meson.build
|
|
+++ b/src/libnmc-setting/meson.build
|
|
@@ -6,7 +6,6 @@ if enable_docs
|
|
input: [nm_settings_docs_xml_gir, nm_property_infos_xml['nmcli']],
|
|
output: 'settings-docs-input.xml',
|
|
command: [
|
|
- python.path(),
|
|
join_paths(meson.source_root(), 'tools', 'generate-docs-nm-settings-docs-merge.py'),
|
|
'@OUTPUT@',
|
|
nm_property_infos_xml['nmcli'],
|
|
diff --git a/src/tests/client/meson.build b/src/tests/client/meson.build
|
|
index b2e455bbbd..a12ebf212a 100644
|
|
--- a/src/tests/client/meson.build
|
|
+++ b/src/tests/client/meson.build
|
|
@@ -6,7 +6,6 @@ test(
|
|
args: [
|
|
build_root,
|
|
source_root,
|
|
- python.path(),
|
|
],
|
|
timeout: 120,
|
|
)
|