diff --git a/Makefile b/Makefile index 5c7a13ff5..c9d9f49a2 100644 --- a/Makefile +++ b/Makefile @@ -65,7 +65,6 @@ CORE_DEPENDS?= apinger \ lighttpd \ minicron \ miniupnpd \ - mpd4 \ mpd5 \ ngattach \ ntp \ diff --git a/src/etc/inc/plugins.inc.d/vpn.inc b/src/etc/inc/plugins.inc.d/vpn.inc index 95487f5a9..7e35dba57 100644 --- a/src/etc/inc/plugins.inc.d/vpn.inc +++ b/src/etc/inc/plugins.inc.d/vpn.inc @@ -304,7 +304,7 @@ EOD; /* fixed to WAN elsewhere, no need to extend, but at least make it work */ legacy_netgraph_attach(get_real_interface('wan')); - mwexec('/usr/local/sbin/mpd4 -b -d /var/etc/pptp-vpn -p /var/run/pptp-vpn.pid -s pptps pptps'); + mwexec('/usr/local/sbin/mpd5 -b -d /var/etc/pptp-vpn -p /var/run/pptp-vpn.pid -s pptps pptps'); break; @@ -543,7 +543,7 @@ EOD; legacy_netgraph_attach($pppoe_interface); - mwexec("/usr/local/sbin/mpd4 -b -d /var/etc/pppoe{$pppoecfg['pppoeid']}-vpn -p /var/run/pppoe{$pppoecfg['pppoeid']}-vpn.pid -s poes poes"); + mwexec("/usr/local/sbin/mpd5 -b -d /var/etc/pppoe{$pppoecfg['pppoeid']}-vpn -p /var/run/pppoe{$pppoecfg['pppoeid']}-vpn.pid -s poes poes"); break; } @@ -732,7 +732,7 @@ EOD; legacy_netgraph_attach(get_real_interface($l2tpcfg['interface'])); - mwexec('/usr/local/sbin/mpd4 -b -d /var/etc/l2tp-vpn -p /var/run/l2tp-vpn.pid -s l2tps l2tps'); + mwexec('/usr/local/sbin/mpd5 -b -d /var/etc/l2tp-vpn -p /var/run/l2tp-vpn.pid -s l2tps l2tps'); break;