646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
35 lines
914 B
Diff
35 lines
914 B
Diff
--- a/properties/nm-openvpn-editor.c
|
|
+++ b/properties/nm-openvpn-editor.c
|
|
@@ -775,8 +775,7 @@
|
|
nm_find_openvpn (void)
|
|
{
|
|
static const char *openvpn_binary_paths[] = {
|
|
- "/usr/sbin/openvpn",
|
|
- "/sbin/openvpn",
|
|
+ "@openvpn@/bin/openvpn",
|
|
NULL
|
|
};
|
|
const char **openvpn_binary = openvpn_binary_paths;
|
|
--- a/src/nm-openvpn-service.c
|
|
+++ b/src/nm-openvpn-service.c
|
|
@@ -522,9 +522,7 @@
|
|
openvpn_binary_find_exepath (void)
|
|
{
|
|
static const char *paths[] = {
|
|
- "/usr/sbin/openvpn",
|
|
- "/sbin/openvpn",
|
|
- "/usr/local/sbin/openvpn",
|
|
+ "@openvpn@/bin/openvpn",
|
|
};
|
|
int i;
|
|
|
|
@@ -2326,7 +2324,7 @@
|
|
_LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting...");
|
|
|
|
if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS)
|
|
- && (system ("/sbin/modprobe tun") == -1))
|
|
+ && (system ("@kmod@/bin/modprobe tun") == -1))
|
|
return EXIT_FAILURE;
|
|
|
|
plugin = nm_openvpn_plugin_new (bus_name);
|