tjh.dev
1--- a/properties/nm-openvpn-editor.c
2+++ b/properties/nm-openvpn-editor.c
3@@ -775,8 +775,7 @@
4 nm_find_openvpn (void)
5 {
6 static const char *openvpn_binary_paths[] = {
7- "/usr/sbin/openvpn",
8- "/sbin/openvpn",
9+ "@openvpn@/bin/openvpn",
10 NULL
11 };
12 const char **openvpn_binary = openvpn_binary_paths;
13--- a/src/nm-openvpn-service.c
14+++ b/src/nm-openvpn-service.c
15@@ -522,9 +522,7 @@
16 openvpn_binary_find_exepath (void)
17 {
18 static const char *paths[] = {
19- "/usr/sbin/openvpn",
20- "/sbin/openvpn",
21- "/usr/local/sbin/openvpn",
22+ "@openvpn@/bin/openvpn",
23 };
24 int i;
25
26@@ -2326,7 +2324,7 @@
27 _LOGD ("nm-openvpn-service (version " DIST_VERSION ") starting...");
28
29 if ( !g_file_test ("/sys/class/misc/tun", G_FILE_TEST_EXISTS)
30- && (system ("/sbin/modprobe tun") == -1))
31+ && (system ("@kmod@/bin/modprobe tun") == -1))
32 return EXIT_FAILURE;
33
34 plugin = nm_openvpn_plugin_new (bus_name);