mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 04:13:31 +00:00
ppp: use modprobe in place of insmod (#10191)
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> Signed-off-by: Manas Sambhus <manas.sambhus+github@gmail.com> Co-authored-by: Manas Sambhus <manas.sambhus+github@gmail.com>
This commit is contained in:
parent
5463662206
commit
936b8f9589
@ -220,9 +220,7 @@ proto_pppoe_setup() {
|
||||
local config="$1"
|
||||
local iface="$2"
|
||||
|
||||
for module in slhc ppp_generic pppox pppoe; do
|
||||
/sbin/insmod $module 2>&- >&-
|
||||
done
|
||||
/sbin/modprobe -qa slhc ppp_generic pppox pppoe
|
||||
|
||||
json_get_var mtu mtu
|
||||
mtu="${mtu:-1492}"
|
||||
@ -271,9 +269,7 @@ proto_pppoa_setup() {
|
||||
local config="$1"
|
||||
local iface="$2"
|
||||
|
||||
for module in slhc ppp_generic pppox pppoatm; do
|
||||
/sbin/insmod $module 2>&- >&-
|
||||
done
|
||||
/sbin/modprobe -qa slhc ppp_generic pppox pppoatm
|
||||
|
||||
json_get_vars atmdev vci vpi encaps
|
||||
|
||||
@ -320,13 +316,8 @@ proto_pptp_setup() {
|
||||
exit 1
|
||||
}
|
||||
|
||||
local load
|
||||
for module in slhc ppp_generic ppp_async ppp_mppe ip_gre gre pptp; do
|
||||
grep -q "^$module " /proc/modules && continue
|
||||
/sbin/insmod $module 2>&- >&-
|
||||
load=1
|
||||
done
|
||||
[ "$load" = "1" ] && sleep 1
|
||||
/sbin/modprobe -qa slhc ppp_generic ppp_async ppp_mppe ip_gre gre pptp
|
||||
sleep 1
|
||||
|
||||
ppp_generic_setup "$config" \
|
||||
plugin pptp.so \
|
||||
@ -344,4 +335,3 @@ proto_pptp_teardown() {
|
||||
[ -f /usr/lib/pppd/*/pppoatm.so ] && add_protocol pppoa
|
||||
[ -f /usr/lib/pppd/*/pptp.so ] && add_protocol pptp
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user