Browse Source

retour au kernel compatible dkms

Votre Nom 1 year ago
parent
commit
2dab1f56d2
3 changed files with 20 additions and 32 deletions
  1. 18 30
      build_cube.sh
  2. 1 1
      options/watchdog.sh
  3. 1 1
      pack/panel

+ 18 - 30
build_cube.sh

@@ -29,20 +29,24 @@ function kernel_check_ {
 if [ $Drivers="AMD" ]
 then
 	unamestr=$(uname -r)
-	if ! [[ "$unamestr" == $kernel_dkms ]]
+	if [[ "$unamestr" == '5.15.0-69-generic' ]]
 	then
-	echo -e "$(tput setaf 10)"
-	echo "Kernel modification:"
-        sudo rm /boot/config-5.15.0.67* | true
-        sudo rm /boot/initrd.img-5.15.0.67* | true
-        sudo rm /boot/System.map-5.15.0.67* | true
-        sudo rm /boot/vmlinuz-5.15.0.67* | true
-	sudo apt-get install linux-image-$kernel_dkms linux-headers-$kernel_dkms linux-modules-extra-$kernel_dkms htop -y
-        sudo update-grub2
-        sudo apt-mark hold linux-image-$kernel_dkms linux-headers-$kernel_dkms linux-modules-extra-$kernel_dkms
+	echo -e "$(tput setaf 10)DKMS Kernel install :$(tput setaf 7)"
+	#if ! [ -f backup_boot.tar.gz ]
+	#then
+	#sudo tar cvfz backup_boot.tar.gz /boot/
+	sudo rm /boot/config-5.15*
+	sudo rm /boot/initrd.img-5.15*
+	sudo rm /boot/System.map-5.15*
+	sudo rm /boot/vmlinuz-5.15*
+	#fi
+	sudo apt-get install linux-image-5.4.0-54-generic linux-headers-5.4.0-54-generic linux-modules-extra-5.4.0-54-generic htop -y
+	sudo update-grub2
+        sudo apt-mark hold linux-image-5.4.0-54-generic linux-headers-5.4.0-54-generic linux-modules-extra-5.4.0-54-generic
         autoroot_
         decompte_
-	elif [[ "$unamestr" == '5.4.0-139-generic' ]]
+	fi
+	if [[ "$unamestr" == '5.4.0-139-generic' ]]
 	then
 	sudo rm /boot/config-5.4.0-139-generic | true
         sudo rm /boot/System.map-5.4.0-139-generic | true
@@ -179,26 +183,13 @@ AMD)
                 cd /home/wareck
                 echo -e ""
                 echo -e "Install drivers:"
-		#wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/amdgpu-install_22.20.50200-1_all.deb -O /home/wareck/Build_Cube/pack/amdgpu-install_22.20.50200-1_all.deb
-		wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/amdgpu-install_5.4.50403-1_all.deb -O /home/wareck/Build_Cube/pack/amdgpu-install_5.4.50403-1_all.deb
+		wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/amdgpu-install_22.20.50200-1_all.deb -O /home/wareck/Build_Cube/pack/amdgpu-install_22.20.50200-1_all.deb
 		wget -c -q --show-progress http://folivier.homelinux.org/cube/pack/linux-firmware.tar.xz
 		tar xfJ linux-firmware.tar.xz
 		sudo cp /home/wareck/linux-firmware/amdgpu/* /lib/firmware/amdgpu/
 		sudo rm -r -f /home/wareck/linux-firmware /home/wareck/linux-firmware.tar.xz
 
-		if lspci -v | grep "Atheros QCA8171" >/dev/null
-		then
-		echo -e "\nAtheros QCA8171 detected WOL patching :"
-		sleep 2
-		cp /home/wareck/Build_Cube/options/tools/kernel_patch.tar.xz /tmp
-		cd /tmp
-		tar xvfJ kernel_patch.tar.xz
-		cd /tmp/kernel_patch/alx_dkms_installer/
-		./setup
-		sleep 1
-		fi
-
-		sudo apt-get install /home/wareck/Build_Cube/pack/amdgpu-install_5.4.50403-1_all.deb -y
+		sudo apt-get install /home/wareck/Build_Cube/pack/amdgpu-install_22.20.50200-1_all.deb -y
 		sudo apt-get update
 		sudo amdgpu-install --opencl=legacy --accept-eula -y
 		sudo apt-get install ocl-icd-opencl-dev -y
@@ -242,7 +233,6 @@ cd /home/wareck/
 echo -e "$(tput setaf 10)\nWebmin uncompress:$(tput sgr0)"
 tar xfJ $Webmin.tar.xz
 rm $Webmin.tar.xz
-echo -n -e "\n"
 echo -e "Done"
 fi
 
@@ -274,7 +264,6 @@ fi
 if ! [ -d cgminer-lketc ]
 then
 git clone https://github.com/wareck/cgminer-lketc.git
-echo -e ""
 fi
 
 fi
@@ -899,7 +888,6 @@ remove_screensaver
 
 echo -e "$(tput setaf 10)\nEnd of script:$(tput sgr0) \n"
 echo -e "$(tput setaf 7)Need to install webmin manually (reboot required)$(tput sgr0)"
-echo -e "$(tput setaf 7)Need to start tightvncserver manually $(tput sgr0)"
-echo -e "$(tput setaf 7)after install webmin, reboot is required for raid drive$(tput sgr0)"
+echo -e "$(tput setaf 7)after install webmin, reboot is required $(tput sgr0)"
 echo -e ""
 

+ 1 - 1
options/watchdog.sh

@@ -56,7 +56,7 @@ then
 sudo cp /etc/crontab /tmp/crontab
 sudo chmod 777 /tmp/crontab
 echo "" >>/tmp/crontab
-echo "* * * * * wareck /usr/local/bin/wd_control.sh" >> /tmp/crontab
+echo "* * * * * root /usr/local/bin/wd_control.sh" >> /tmp/crontab
 sudo chmod 644 /tmp/crontab
 sudo mv /tmp/crontab /etc/
 fi

+ 1 - 1
pack/panel

@@ -115,7 +115,7 @@ Plugin {
 Plugin {
   type=sensors
   Config {
-    ChipNr=4
+    ChipNr=3
     FeatureNr=15
     Fahrenheit=0
     HideUnit=0