lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 08:34:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: move mpd.script to scripts dir

Browse Source 
mpd5 is started with -d /var/etc so it expects mpd.script to be there.
Some small simplifications along the way.
This commit is contained in:
Franco Fichtner 2018-05-06 14:27:06 +02:00
parent cfc95122f2
commit 75c3100ba7
3 changed files with 13 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plist
View File

@ -685,6 +685,7 @@
/usr/local/opnsense/scripts/interfaces/list_interfaces.php
/usr/local/opnsense/scripts/interfaces/list_macdb.py
/usr/local/opnsense/scripts/interfaces/list_ndp.py
/usr/local/opnsense/scripts/interfaces/mpd.script
/usr/local/opnsense/scripts/interfaces/ppp-linkdown.sh
/usr/local/opnsense/scripts/interfaces/ppp-linkup.sh
/usr/local/opnsense/scripts/interfaces/ppp-log-uptime.sh
@ -1566,7 +1567,6 @@
/usr/local/sbin/3gstats.php
/usr/local/sbin/beep.sh
/usr/local/sbin/configctl
/usr/local/sbin/mpd.script
/usr/local/sbin/opnsense-auth
/usr/local/sbin/opnsense-importer
/usr/local/sbin/opnsense-installer

35
src/etc/inc/interfaces.inc
View File

@ -1172,9 +1172,7 @@ function interface_ppps_configure($interface)
}
// 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');
}
@copy('/usr/local/opnsense/scripts/interfaces/mpd.script', '/var/etc/mpd.script');
if (isset($config['ppps']['ppp'])) {
foreach ($config['ppps']['ppp'] as $pppid => $ppp) {
@ -1444,31 +1442,22 @@ EOD;
$mpdconf .= "\topen\n";
}
/* Generate mpd.conf. If mpd_[interface].conf exists in the conf path, then link to it instead of generating a fresh conf file. */
if (file_exists("/conf/mpd_{$interface}.conf")) {
@symlink("/conf/mpd_{$interface}.conf", "/var/etc/mpd_{$interface}.conf");
} else {
$fd = fopen("/var/etc/mpd_{$interface}.conf", "w");
if (!$fd) {
log_error("Error: cannot open mpd_{$interface}.conf in interface_ppps_configure().");
return 0;
}
// Write out mpd_ppp.conf
fwrite($fd, $mpdconf);
fclose($fd);
unset($mpdconf);
$fd = fopen("/var/etc/mpd_{$interface}.conf", "w");
if (!$fd) {
log_error("Error: cannot open mpd_{$interface}.conf in interface_ppps_configure().");
return 0;
}
// Write out mpd_ppp.conf
fwrite($fd, $mpdconf);
fclose($fd);
unset($mpdconf);
// Create the uptime log if requested and if it doesn't exist already, or delete it if it is no longer requested.
if (isset($ppp['uptime'])) {
if (!file_exists("/conf/{$ifcfg['if']}.log")) {
file_put_contents("/conf/{$ifcfg['if']}.log", '');
}
@touch("/conf/{$ifcfg['if']}.log");
} else {
if (file_exists("/conf/{$ifcfg['if']}.log")) {
@unlink("/conf/{$ifcfg['if']}.log");
}
@unlink("/conf/{$ifcfg['if']}.log");
}
/* clean up old lock files */

0
src/sbin/mpd.script → src/opnsense/scripts/interfaces/mpd.script
View File