diff options
| author | Ermal <eri@pfsense.org> | 2012-05-23 19:25:53 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2012-05-23 19:25:53 +0000 |
| commit | 062676f880878f788315991de861a71ccb86a478 (patch) | |
| tree | b10d3c72c7738c4fdd49cc2569014fc8b8d89b63 /etc/inc | |
| parent | fbda07b9482681a9bf8b7385a62b0d96a1e2a532 (diff) | |
| download | pfsense-062676f880878f788315991de861a71ccb86a478.zip pfsense-062676f880878f788315991de861a71ccb86a478.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/inc')
| -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 b8ba7c8..0325c0d 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -1454,6 +1454,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 */ |
