From 3bb0e00e1987c6cc8da0c9b3062192bb2da1e592 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sun, 30 Dec 2018 14:03:45 +0100 Subject: [PATCH] interfaces: loosely related cleanups #2707 --- src/etc/inc/interfaces.inc | 3 --- src/www/interfaces_ppps_edit.php | 12 +++++------- 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index 7c5fce471..e0000bf2a 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -1171,9 +1171,6 @@ function interface_ppps_configure($interface) return 0; } - // mpd5 requires a /var/spool/lock directory for PPP modem links. - @mkdir("/var/spool/lock", 0777, true); - // mpd5 modem chat script expected in the same directory as the mpd_xxx.conf files if (!file_exists('/var/etc/mpd.script')) { symlink('/usr/local/sbin/mpd.script', '/var/etc/mpd.script'); diff --git a/src/www/interfaces_ppps_edit.php b/src/www/interfaces_ppps_edit.php index 88f45fab4..1e2d86f49 100644 --- a/src/www/interfaces_ppps_edit.php +++ b/src/www/interfaces_ppps_edit.php @@ -231,11 +231,6 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { $ppp['mru'] = implode(',', $port_data['mru']); $ppp['mrru'] = implode(',', $port_data['mrru']); - // XXX this was already in here, but is probably not the correct place to create this - if (!is_dir('/var/spool/lock')) { - mwexec('/bin/mkdir -p /var/spool/lock'); - } - if (isset($id)) { $a_ppps[$id] = $ppp; } else { @@ -243,11 +238,14 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') { } write_config(); + $iflist = get_configured_interface_with_descr(); foreach ($iflist as $pppif => $ifdescr) { - if ($config['interfaces'][$pppif]['if'] == $ppp['if']) - interface_ppps_configure($pppif); + if ($config['interfaces'][$pppif]['if'] == $ppp['if']) { + interface_ppps_configure($pppif); + } } + header(url_safe('Location: /interfaces_ppps.php')); exit; }