diff options
| author | Ermal <eri@pfsense.org> | 2012-05-23 19:26:56 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-05-23 19:26:56 +0000 |
| commit | c714a1afdae4ce79dcb51e07787303b64ccf212a (patch) | |
| tree | 4fd425c70abbee23cba38bf47c4aee442aa366e6 /etc | |
| parent | e39b6feb28bfbd72d0dca923bdc2d458b84476bd (diff) | |
| download | pfsense-c714a1afdae4ce79dcb51e07787303b64ccf212a.zip pfsense-c714a1afdae4ce79dcb51e07787303b64ccf212a.tar.gz | |
Fixes #2364. On busy pppoe servers it might take some time before mpd exits. Check for this before trying to restart
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/vpn.inc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 20c2d8a..84c94cc 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -1394,6 +1394,10 @@ EOD; chmod("{$g['varetc_path']}/pppoe{$pppoecfg['pppoeid']}-vpn/mpd.secret", 0600); } + /* Check if previous instance is still up */ + while (file_exists("{$g['varrun_path']}/pppoe{$pppoecfg['pppoeid']}-vpn.pid") && isvalidpid("{$g['varrun_path']}/pppoe{$pppoecfg['pppoeid']}-vpn.pid")) + killbypid("{$g['varrun_path']}/pppoe{$pppoecfg['pppoeid']}-vpn.pid"); + /* Get support for netgraph(4) from the nic */ pfSense_ngctl_attach(".", $pppoe_interface); /* fire up mpd */ |
