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

interfaces: ensure PPP netgraph node has the proper name #4696

Browse Source
This commit is contained in:
Franco Fichtner 2023-04-14 10:54:29 +02:00
parent cc297e741b
commit 947ed4925a
3 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
plist
View File

@ -910,6 +910,7 @@
/usr/local/opnsense/scripts/interfaces/ping.py
/usr/local/opnsense/scripts/interfaces/ppp-linkdown.sh
/usr/local/opnsense/scripts/interfaces/ppp-linkup.sh
/usr/local/opnsense/scripts/interfaces/ppp-rename.sh
/usr/local/opnsense/scripts/interfaces/ppp-uptime.sh
/usr/local/opnsense/scripts/interfaces/reconfigure_vips.php
/usr/local/opnsense/scripts/interfaces/reconfigure_vlans.php

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

@ -1275,6 +1275,9 @@ EOD;
sleep(1);
$i++;
}
/* appease netgraph by setting the correct node name */
shell_exec('/usr/local/opnsense/scripts/interfaces/ppp-rename.sh %s %s %s', [$interface, $ifcfg['if'], $ppp['type']]);
}
function interfaces_carp_setup()

44
src/opnsense/scripts/interfaces/ppp-rename.sh Executable file
View File

@ -0,0 +1,44 @@
#!/bin/sh
# Copyright (c) 2023 Franco Fichtner <franco@opnsense.org>
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# 1. Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# 2. Redistributions in binary form must reproduce the above copyright
# notice, this list of conditions and the following disclaimer in the
# documentation and/or other materials provided with the distribution.
#
# THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
# INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
# AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
# OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
# look for <unnamed> netgraph node to rename since mpd5 does not do it
if [ -z "${1}" -o -z "${2}" -o -z "${3}" ]; then
return
fi
INTERFACE=${1}_link
NG_DEVICE=$(echo ${2} | sed 's/[.:]/_/g')
NG_TYPE=${3}
ngctl list | while read _NAME NAME _TYPE TYPE _ID ID MORE; do
if [ "${NAME}" != "<unnamed>" -o "${TYPE}" != "${NG_TYPE}" ]; then
continue
fi
if [ "$(ngctl info "[${ID}]:" | grep -c ${INTERFACE})" = "0" ]; then
continue
fi
ngctl name "[${ID}]:" "${NG_DEVICE}"
done