summaryrefslogtreecommitdiffstats
path: root/etc/inc/openvpn.inc
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-06-24 19:09:07 +0000
committerErmal <eri@pfsense.org>2011-06-24 19:09:07 +0000
commit5a7cc1f9e9a94c0bf479cd498e5a51b8fce27511 (patch)
treec8d35a28a4ccce17a38b9b1288e291eac6a34a81 /etc/inc/openvpn.inc
parent01599e5e95cdc329ccb062fe0837b216af67b2cc (diff)
downloadpfsense-5a7cc1f9e9a94c0bf479cd498e5a51b8fce27511.zip
pfsense-5a7cc1f9e9a94c0bf479cd498e5a51b8fce27511.tar.gz
No need to use nohup when using mwexec_bg since it calls nohup itself. Also use fullpath to executables.
Diffstat (limited to 'etc/inc/openvpn.inc')
-rw-r--r--etc/inc/openvpn.inc4
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc
index edd22be..5e4dd1e 100644
--- a/etc/inc/openvpn.inc
+++ b/etc/inc/openvpn.inc
@@ -161,7 +161,7 @@ function openvpn_port_next($prot) {
function openvpn_get_cipherlist() {
$ciphers = array();
- $cipher_out = shell_exec('openvpn --show-ciphers | grep "default key" | awk \'{print $1, "(" $2 "-" $3 ")";}\'');
+ $cipher_out = shell_exec('/usr/local/sbin/openvpn --show-ciphers | /usr/bin/grep "default key" | /usr/bin/awk \'{print $1, "(" $2 "-" $3 ")";}\'');
$cipher_lines = explode("\n", trim($cipher_out));
sort($cipher_lines);
foreach ($cipher_lines as $line) {
@@ -606,7 +606,7 @@ function openvpn_restart($mode, $settings) {
/* start the new process */
$fpath = $g['varetc_path']."/openvpn/{$mode_id}.conf";
- mwexec_bg("nohup openvpn --config {$fpath}");
+ mwexec_bg("/usr/local/sbin/openvpn --config {$fpath}");
if (!$g['booting'])
send_event("filter reload");
OpenPOWER on IntegriCloud