lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-20 03:16:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

interfaces: move ppp-related scripts to proper location

Browse Source 
sbin/ is for console-bound binaries.
This commit is contained in:
Franco Fichtner 2018-05-06 13:31:53 +02:00
parent 38be942639
commit cfc95122f2
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
plist
View File

@ -685,6 +685,10 @@
/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/ppp-linkdown.sh
/usr/local/opnsense/scripts/interfaces/ppp-linkup.sh
/usr/local/opnsense/scripts/interfaces/ppp-log-uptime.sh
/usr/local/opnsense/scripts/interfaces/ppp-uptime.sh
/usr/local/opnsense/scripts/ipsec/connect.py
/usr/local/opnsense/scripts/ipsec/disconnect.py
/usr/local/opnsense/scripts/ipsec/list_leases.py
@ -1570,10 +1574,6 @@
/usr/local/sbin/opnsense-version
/usr/local/sbin/ping_hosts.sh
/usr/local/sbin/pluginctl
/usr/local/sbin/ppp-linkdown
/usr/local/sbin/ppp-linkup
/usr/local/sbin/ppp-log-uptime.sh
/usr/local/sbin/ppp-uptime.sh
/usr/local/share/man/man8/opnsense-importer.8.gz
/usr/local/share/man/man8/opnsense-installer.8.gz
/usr/local/share/man/man8/opnsense-shell.8.gz

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

@ -1304,8 +1304,8 @@ EOD;
$mpdconf .= " set iface enable tcpmssfix\n";
}
$mpdconf .= " set iface up-script /usr/local/sbin/ppp-linkup\n";
$mpdconf .= " set iface down-script /usr/local/sbin/ppp-linkdown\n";
$mpdconf .= " set iface up-script /usr/local/opnsense/scripts/interfaces/ppp-linkup.sh\n";
$mpdconf .= " set iface down-script /usr/local/opnsense/scripts/interfaces/ppp-linkdown.sh\n";
if ($ppp['type'] == "ppp") {
if (is_ipaddr($ppp['localip'])) {
$localip = $ppp['localip'];
@ -4308,7 +4308,7 @@ function get_interfaces_info()
}
if (file_exists("/var/run/{$link_type}_{$ifdescr}.pid")) {
$sec = trim(`/usr/local/sbin/ppp-uptime.sh {$ifinfo['if']}`);
$sec = trim(`/usr/local/opnsense/scripts/interfaces/ppp-uptime.sh {$ifinfo['if']}`);
$ifinfo['ppp_uptime'] = convert_seconds_to_hms($sec);
}

2
src/sbin/ppp-linkdown → src/opnsense/scripts/interfaces/ppp-linkdown.sh
View File

@ -14,7 +14,7 @@ ngctl shutdown ${IF}:
if [ "${AF}" = "inet" ]; then
if [ -f /tmp/${IF}up ] && [ -f /conf/${IF}.log ]; then
seconds=$((`date -j +%s` - `/usr/bin/stat -f %m /tmp/${IF}up`))
/usr/local/sbin/ppp-log-uptime.sh $seconds ${IF} &
/usr/local/opnsense/scripts/interfaces/ppp-log-uptime.sh $seconds ${IF} &
fi
if [ -s "/tmp/${IF}_defaultgw" ]; then

0
src/sbin/ppp-linkup → src/opnsense/scripts/interfaces/ppp-linkup.sh
View File

0
src/sbin/ppp-log-uptime.sh → src/opnsense/scripts/interfaces/ppp-log-uptime.sh
View File

0
src/sbin/ppp-uptime.sh → src/opnsense/scripts/interfaces/ppp-uptime.sh
View File