Skip to content

Commit

Permalink
[bot] AutoMerging: merge all upstream's changes:
Browse files Browse the repository at this point in the history
* https://github.com/coolsnowwolf/lede:
  ppp: use modprobe in place of insmod (coolsnowwolf#10191)
  Update README.md
  Add `aria2` to deps (coolsnowwolf#10188)
  • Loading branch information
github-actions[bot] committed Sep 28, 2022
2 parents 4e942d0 + 936b8f9 commit f2aaf4e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 17 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# 欢迎来到 Lean 的 Openwrt 源码仓库
# 欢迎来到 Lean 的 LEDE 源码仓库

如何编译自己需要的 OpenWrt 固件 [How to build your Openwrt firmware](./README_EN.md)
如何编译自己需要的 LEDE 固件 [How to build your LEDE firmware](./README_EN.md)

## 官方讨论群
如有技术问题需要讨论或者交流,欢迎加入以下群:
Expand All @@ -22,7 +22,7 @@
```bash
sudo apt update -y
sudo apt full-upgrade -y
sudo apt install -y ack antlr3 asciidoc autoconf automake autopoint binutils bison build-essential \
sudo apt install -y ack antlr3 aria2 asciidoc autoconf automake autopoint binutils bison build-essential \
bzip2 ccache cmake cpio curl device-tree-compiler fastjar flex gawk gettext gcc-multilib g++-multilib \
git gperf haveged help2man intltool libc6-dev-i386 libelf-dev libglib2.0-dev libgmp3-dev libltdl-dev \
libmpc-dev libmpfr-dev libncurses5-dev libncursesw5-dev libreadline-dev libssl-dev libtool lrzsz \
Expand Down
18 changes: 4 additions & 14 deletions package/network/services/ppp/files/ppp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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 \
Expand All @@ -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
}

0 comments on commit f2aaf4e

Please sign in to comment.