diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-02-05 22:03:27 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-02-05 22:03:27 +0000 |
| commit | 48bff85c62065eca80ac443559d5a12319269a2b (patch) | |
| tree | d388927dfe40d913a1a4113e31bacdb9d1246601 /etc/inc/vpn.inc | |
| parent | 5c83df3039728f347149d6f79474a2d087ffe7e9 (diff) | |
| download | pfsense-48bff85c62065eca80ac443559d5a12319269a2b.zip pfsense-48bff85c62065eca80ac443559d5a12319269a2b.tar.gz | |
* Sleep a little longer after killing mpd to allow it to cleanup
* If there was a problem killing mpd, try killing once more and log the attempt
Diffstat (limited to 'etc/inc/vpn.inc')
| -rw-r--r-- | etc/inc/vpn.inc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 8021b45..b52561b 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -598,7 +598,12 @@ function vpn_pptpd_configure() { killbypid("{$g['varrun_path']}/mpd-vpn.pid"); /* wait for process to die */ - sleep(2); + sleep(3); + + if(is_process_running("mpd -b")) { + killbypid("{$g['varrun_path']}/mpd-vpn.pid"); + log_error("Could not kill mpd within 3 seconds. Trying again."); + } /* remove mpd.conf, if it exists */ unlink_if_exists("{$g['varetc_path']}/mpd-vpn/mpd.conf"); |
