Skip to content

[pull] master from ylx2016:master #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Apr 9, 2021
+5 −6
Merged

[pull] master from ylx2016:master #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tcp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1625,7 +1625,7 @@ check_sys_bbrplusnew(){
check_sys_xanmod(){
check_version
if [[ "${release}" == "centos" ]]; then
if [[ ${version} = "7" || ${version} = "8" ]]; then
if [[ ${version} = "7" ]]; then
installxanmod
else
echo -e "${Error} xanmod内核不支持当前系统 ${release} ${version} ${bit} !" && exit 1
Expand Down
9 changes: 4 additions & 5 deletions tcpx.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ installbbrplus(){
yum install -y kernel-c7.rpm
yum install -y kernel-headers-c7.rpm
else
echo -e "${Error} 还在用32位，别再见了 !" && exit 1
echo -e "${Error} 还在用32位，别再见了 !" && exit 1
fi
fi

Expand Down Expand Up @@ -349,6 +349,7 @@ installxanmod(){
fi

elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then

if [[ ${bit} = "x86_64" ]]; then
# kernel_version="5.11.4-xanmod"
# xanmod_ver_b=$(rm -rf /tmp/url.tmp && curl -o /tmp/url.tmp 'https://dl.xanmod.org/dl/changelog/?C=N;O=D' && grep folder.gif /tmp/url.tmp | head -n 1 | awk -F "[/]" '{print $5}' | awk -F "[>]" '{print $2}')
Expand Down Expand Up @@ -378,7 +379,7 @@ installxanmod(){
dpkg -i linux-image-d10.deb
dpkg -i linux-headers-d10.deb
else
echo -e "${Error} 还在用32位，别再见了 !" && exit 1
echo -e "${Error} 还在用32位，别再见了 !" && exit 1
fi
fi

Expand Down Expand Up @@ -447,8 +448,6 @@ installbbrplusnew(){

}



#启用BBR+fq
startbbrfq(){
remove_bbr_lotserver
Expand Down Expand Up @@ -1590,7 +1589,7 @@ check_sys_bbrplusnew(){
check_sys_xanmod(){
check_version
if [[ "${release}" == "centos" ]]; then
if [[ ${version} = "7" || ${version} = "8" ]]; then
if [[ ${version} = "7" ]]; then
installxanmod
else
echo -e "${Error} xanmod内核不支持当前系统 ${release} ${version} ${bit} !" && exit 1
Expand Down