Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ppp: use modprobe in place of insmod

Browse source 
This will prevent `module is already loaded` lines from
appearing in the logs when a PPP connection is reconnecting

Signed-off-by: Manas Sambhus <manas.sambhus+github@gmail.com>
This commit is contained in:
Manas Sambhus 2022-07-09 11:56:09 +05:30 committed by Christian Marangi
parent c092b3ba63
commit db0c0a31d8
No known key found for this signature in database
GPG key ID: AC001D09ADBFEAD7
2 changed files with 5 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package/network/services/ppp/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ppp PKG_NAME:=ppp
PKG_RELEASE:=3 PKG_RELEASE:=4
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/paulusmack/ppp PKG_SOURCE_URL:=https://github.com/paulusmack/ppp

18
package/network/services/ppp/files/ppp.sh
View file

@ -220,9 +220,7 @@ proto_pppoe_setup() {
local config="$1" local config="$1"
local iface="$2" local iface="$2"
for module in slhc ppp_generic pppox pppoe; do /sbin/modprobe -qa slhc ppp_generic pppox pppoe
/sbin/insmod $module 2>&- >&-
done
json_get_var mtu mtu json_get_var mtu mtu
mtu="${mtu:-1492}" mtu="${mtu:-1492}"
@ -262,9 +260,7 @@ proto_pppoa_setup() {
local config="$1" local config="$1"
local iface="$2" local iface="$2"
for module in slhc ppp_generic pppox pppoatm; do /sbin/modprobe -qa slhc ppp_generic pppox pppoatm
/sbin/insmod $module 2>&- >&-
done
json_get_vars atmdev vci vpi encaps json_get_vars atmdev vci vpi encaps
@ -311,13 +307,8 @@ proto_pptp_setup() {
exit 1 exit 1
} }
local load /sbin/modprobe -qa slhc ppp_generic ppp_async ppp_mppe ip_gre gre pptp
for module in slhc ppp_generic ppp_async ppp_mppe ip_gre gre pptp; do sleep 1
grep -q "^$module " /proc/modules && continue
/sbin/insmod $module 2>&- >&-
load=1
done
[ "$load" = "1" ] && sleep 1
ppp_generic_setup "$config" \ ppp_generic_setup "$config" \
plugin pptp.so \ plugin pptp.so \
@ -335,4 +326,3 @@ proto_pptp_teardown() {
[ -f /usr/lib/pppd/*/pppoatm.so ] && add_protocol pppoa [ -f /usr/lib/pppd/*/pppoatm.so ] && add_protocol pppoa
[ -f /usr/lib/pppd/*/pptp.so ] && add_protocol pptp [ -f /usr/lib/pppd/*/pptp.so ] && add_protocol pptp
} }