From 555e30f7d9c93a5d18071c4191689ddfa140e6e7 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Thu, 27 Nov 2008 00:20:27 +0000 Subject: Only pause 5 seconds if we actually started openvpn --- etc/inc/openvpn.inc | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 417d108..7cdbc87 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -471,10 +471,13 @@ function openvpn_create_cscdir() { function openvpn_resync_all() { global $config; + $started = false; + foreach (array('server', 'client') as $mode) { if (is_array($config['installedpackages']["openvpn$mode"]['config'])) { foreach ($config['installedpackages']["openvpn$mode"]['config'] as $id => $settings) openvpn_resync($mode, $id); + $started = true; } } @@ -482,13 +485,15 @@ function openvpn_resync_all() { if (is_array($config['installedpackages']['openvpncsc']['config'])) { foreach ($config['installedpackages']['openvpncsc']['config'] as $id => $csc) openvpn_resync_csc($id); + $started = true; } /* give speedy machines time to settle */ - sleep(5); - - /* reload the filter policy */ - filter_configure(); + if($started) { + sleep(5); + /* reload the filter policy */ + filter_configure(); + } } -- cgit v1.1