From a138f4fbc077f89ff413355ba738e00d36317973 Mon Sep 17 00:00:00 2001 From: Ermal Date: Wed, 16 Jun 2010 11:01:24 +0000 Subject: [PATCH] Fixes #667. Do not bring down mpd5 if the interface is configured for dial on-demand. --- etc/inc/interfaces.inc | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 84e1376521..65d61d58fc 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -812,9 +812,18 @@ function interface_bring_down($interface = "wan", $destroy = false) { case "pppoe": case "pptp": case "l2tp": - killbypid("{$g['varrun_path']}/{$ifcfg['ipaddr']}_{$interface}.pid"); - sleep(2); - unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf"); + if (is_array($config['ppps']['ppp']) && count($config['ppps']['ppp'])) { + foreach ($config['ppps']['ppp'] as $pppid => $ppp) { + if ($realif == $ppp['if']) { + if (!isset($ppp['ondemand'])) { + killbypid("{$g['varrun_path']}/{$ifcfg['ipaddr']}_{$interface}.pid"); + sleep(2); + unlink_if_exists("{$g['varetc_path']}/mpd_{$interface}.conf"); + } + break; + } + } + } break; case "carpdev-dhcp": /*