Преглед на файлове

update kernel, little optimize (#10)

* update debian kernel

* update centos kernel

* rebuild debian kernel

* recover path
cx9208 преди 6 години
родител
ревизия
a7a0c89697

BIN
bbrplus/centos/7/kernel-4.14.90.rpm → bbrplus/centos/7/kernel-4.14.91.rpm


BIN
bbrplus/centos/7/kernel-headers-4.14.91.rpm


BIN
bbrplus/debian-ubuntu/x64/linux-headers-4.14.90.deb → bbrplus/debian-ubuntu/x64/linux-headers-4.14.91.deb


BIN
bbrplus/debian-ubuntu/x64/linux-image-4.14.90.deb → bbrplus/debian-ubuntu/x64/linux-image-4.14.91.deb


+ 11 - 8
tcp.sh

@@ -5,12 +5,12 @@ export PATH
 #=================================================
 #	System Required: CentOS 6/7,Debian 8/9,Ubuntu 16+
 #	Description: BBR+BBR魔改版+BBRplus+Lotserver
-#	Version: 1.2.0
+#	Version: 1.2.1
 #	Author: 千影,cx9208
 #	Blog: https://www.94ish.me/
 #=================================================
 
-sh_ver="1.2.0"
+sh_ver="1.2.1"
 github="raw.githubusercontent.com/chiakge/Linux-NetSpeed/master"
 
 Green_font_prefix="\033[32m" && Red_font_prefix="\033[31m" && Green_background_prefix="\033[42;37m" && Red_background_prefix="\033[41;37m" && Font_color_suffix="\033[0m"
@@ -53,14 +53,16 @@ installbbr(){
 
 #安装BBRplus内核
 installbbrplus(){
-	kernel_version="4.14.90"
+	kernel_version="4.14.91"
 	if [[ "${release}" == "centos" ]]; then
-		wget https://${github}/bbrplus/${release}/${version}/kernel-4.14.90.rpm
-		yum install -y kernel-4.14.90.rpm
-                rm -f kernel-4.14.90.rpm
+		wget -N --no-check-certificate https://${github}/bbrplus/${release}/${version}/kernel-${kernel_version}.rpm
+		yum install -y kernel-${kernel_version}.rpm
+		rm -f kernel-${kernel_version}.rpm
 	elif [[ "${release}" == "debian" || "${release}" == "ubuntu" ]]; then
 		mkdir bbrplus && cd bbrplus
+		wget -N --no-check-certificate http://${github}/bbrplus/debian-ubuntu/${bit}/linux-headers-${kernel_version}.deb
 		wget -N --no-check-certificate http://${github}/bbrplus/debian-ubuntu/${bit}/linux-image-${kernel_version}.deb
+		dpkg -i linux-headers-${kernel_version}.deb
 		dpkg -i linux-image-${kernel_version}.deb
 		cd .. && rm -rf bbrplus
 	fi
@@ -428,7 +430,7 @@ detele_kernel(){
 				rpm -e ${rpm_del}
 				echo -e "卸载 ${rpm_del} 内核卸载完成,继续..."
 			done
-			echo -e "内核卸载完毕,继续..."
+			echo --nodeps -e "内核卸载完毕,继续..."
 		else
 			echo -e " 检测到 内核 数量不正确,请检查 !" && exit 1
 		fi
@@ -607,7 +609,8 @@ check_sys_Lotsever(){
 
 check_status(){
 	kernel_version=`uname -r | awk -F "-" '{print $1}'`
-	if [[ ${kernel_version} = "4.14.90" ]]; then
+	kernel_version_full=`uname -r`
+	if [[ ${kernel_version_full} = "4.14.91-bbrplus" ]]; then
 		kernel_status="BBRplus"
 	elif [[ ${kernel_version} = "3.10.0" || ${kernel_version} = "3.16.0" || ${kernel_version} = "3.2.0" || ${kernel_version} = "4.4.0" || ${kernel_version} = "3.13.0"  || ${kernel_version} = "2.6.32" ]]; then
 		kernel_status="Lotserver"