From 95aa2585d6f666e66c6c0e9a25e52663d2d9c370 Mon Sep 17 00:00:00 2001 From: ich777 Date: Tue, 19 Jul 2022 10:26:37 +0200 Subject: [PATCH] cleanup and necessary changes - removed wait for network - cleanup - necessary changes for 6.11+ --- amd-vendor-reset.plg | 133 ++++++++++++++++++++++--------------------- 1 file changed, 68 insertions(+), 65 deletions(-) diff --git a/amd-vendor-reset.plg b/amd-vendor-reset.plg index 9168121..72021b0 100644 --- a/amd-vendor-reset.plg +++ b/amd-vendor-reset.plg @@ -2,19 +2,20 @@ - + + ]> -###2022.04.11 -- Added Plugin Update Helper when up-/downgrading unRAID version +###2022.07.19 +- Necessary changes for unRAID 6.11+ ###2022.03.21 - Added change for reset_method for Kernel 5.15+ @@ -38,34 +39,14 @@ This package contains the Vendor Reset module for Polaris, Vega10/20 and Navi10/ -KERNEL_V="$(uname -r)" -PACKAGE="gnif_vendor_reset-plugin-${KERNEL_V}" -DL_URL="https://github.com/ich777/unraid-amd-vendor-reset/releases/download/$KERNEL_V" - -#Wait for Network and timeout after 30 seconds -HOST="8.8.8.8" -for i in {1..10}; do - ping -c1 $HOST &> /dev/null && break; -done - -if [ ! -d "&plugin;/packages/${KERNEL_V%%-*}" ]; then - mkdir -p "&plugin;/packages/${KERNEL_V%%-*}" -fi - -#Check for old packages -rm -rf $(ls -d &plugin;/packages/* | grep -v "${KERNEL_V%%-*}") - -if [ ! -f "&plugin;/AMD-Vendor-Reset.png" ]; then - wget -q -nc --show-progress --progress=bar:force:noscroll -O "&plugin;/&name;.png" "https://raw.githubusercontent.com/ich777/docker-templates/master/ich777/images/gnif.png" -fi - download() { -#Download vendor-reset -if wget -q -nc --show-progress --progress=bar:force:noscroll -O "&plugin;/packages/${KERNEL_V%%-*}/${PACKAGE}-1.txz" "${DL_URL}/${PACKAGE}-1.txz" ; then - if [ "$(md5sum "&plugin;/packages/${KERNEL_V%%-*}/${PACKAGE}-1.txz" | cut -d ' ' -f1)" != "$(wget -qO- "${DL_URL}/${PACKAGE}-1.txz.md5" | cut -d ' ' -f1)" ]; then +# Download vendor-reset +if wget -q -nc --show-progress --progress=bar:force:noscroll -O "&packages;/${KERNEL_V%%-*}/${PACKAGE}-1.txz" "${DL_URL}/${PACKAGE}-1.txz" ; then + if [ "$(md5sum "&packages;/${KERNEL_V%%-*}/${PACKAGE}-1.txz" | cut -d ' ' -f1)" != "$(wget -qO- "${DL_URL}/${PACKAGE}-1.txz.md5" | cut -d ' ' -f1)" ]; then echo echo "-----ERROR - ERROR - ERROR - ERROR - ERROR - ERROR - ERROR - ERROR - ERROR------" echo "--------------------------------CHECKSUM ERROR!---------------------------------" + rm -rf &plugin; &emhttp; exit 1 fi echo @@ -74,12 +55,13 @@ else echo echo "-----ERROR - ERROR - ERROR - ERROR - ERROR - ERROR - ERROR - ERROR - ERROR-----" echo "----------------------Can't download AMD Vendor Reset--------------------------" + rm -rf &plugin; &emhttp; exit 1 fi } check() { -if [ ! -f "&plugin;/packages/${KERNEL_V%%-*}/${PACKAGE}-1.txz" ]; then +if [ ! -f "&packages;/${KERNEL_V%%-*}/${PACKAGE}-1.txz" ]; then echo echo "-----------------Downloading AMD Vendor Reset, please wait...!----------------" echo "----------This could take some time, please don't close this window!----------" @@ -91,15 +73,70 @@ fi } install() { -#Install AMD Vendor Reset -/sbin/installpkg "&plugin;/packages/${KERNEL_V%%-*}/${PACKAGE}-1.txz" +# Install AMD Vendor Reset +/sbin/installpkg "&packages;/${KERNEL_V%%-*}/${PACKAGE}-1.txz" depmod -a -modprobe vendor_reset } +activate() { +# Modprobe AMD Vendor Reset +/sbin/modprobe vendor_reset +} + +# Define Variables +KERNEL_V="$(uname -r)" +PACKAGE="gnif_vendor_reset-plugin-${KERNEL_V}" +DL_URL="https://github.com/ich777/unraid-amd-vendor-reset/releases/download/$KERNEL_V" + +if [ ! -d "&packages;/${KERNEL_V%%-*}" ]; then + mkdir -p "&packages;/${KERNEL_V%%-*}" +fi + +#Check for old packages +rm -rf $(ls -d &packages;/* | grep -v "${KERNEL_V%%-*}") + +if [ ! -f "&plugin;/AMD-Vendor-Reset.png" ]; then + wget -q -nc --show-progress --progress=bar:force:noscroll -O "&plugin;/&name;.png" "https://raw.githubusercontent.com/ich777/docker-templates/master/ich777/images/gnif.png" +fi + #Check if AMD Vendor Reset is already downloaded check +# Check if AMD Vendor Reset module is already installed +if ! modinfo vendor_reset -0 >/dev/null 2>&1 ; then + echo + echo "-----------------Installing AMD Vendor Reset, please wait...!-----------------" + install > /dev/null + activate + echo + echo "----------------Installation of AMD Vendor Reset successful-------------------" + echo +else + activate + echo + echo "----------------Installation of AMD Vendor Reset successful-------------------" +fi + +# Change reset_method for installed AMD VGA adapters for Kernel 5.15+ +# https://github.com/gnif/vendor-reset/issues/46#issuecomment-992282166 +TARGET_V="5.14.99" +COMPARE="$(uname -r | cut -d '-' -f1) +$TARGET_V" +if [ "$TARGET_V" != "$(echo "$COMPARE" | sort -V | tail -1)" ]; then + while read -r line + do + echo 'device_specific' > $(find /sys/bus/pci/devices/* -name "*$line")/reset_method + done <<< "$(lspci -nn | grep -E "VGA compatible controller|Display controller" | grep -E "AMD|ATI|Advanced Micro Devices" | awk '{print $1}')" +fi + +#Install icon +if [ ! -f "&emhttp;/images/&name;.png" ]; then + if [ ! -d "&emhttp;/images" ]; then + mkdir -p &emhttp;/images + fi + cp &plugin;/&name;.png &emhttp;/images/ +fi + #Check if Plugin Update Helper is downloaded and up-to-date if [ ! -f &plugin;/plugin_update_helper ]; then wget -q -T 5 -O &plugin;/plugin_update_helper "https://raw.githubusercontent.com/ich777/unraid-plugin_update_helper/master/plugin_update_helper" @@ -140,40 +177,6 @@ if [ -z "$(ps aux | grep -E "inotifywait -q /boot/changes.txt -e move_self,delet echo "/usr/bin/plugin_update_helper" | at now > /dev/null 2>&1 fi -if [ ! -z "$(lsmod | grep "vendor_reset")" ]; then - modprobe vendor_reset - echo - echo "------------Nothing to do, AMD Vendor Reset is already installed!-------------" - echo -else - echo - echo "-----------------Installing AMD Vendor Reset, please wait...!-----------------" - install > /dev/null - echo - echo "----------------Installation of AMD Vendor Reset successful-------------------" - echo -fi - -#Change reset_method for installed AMD VGA adapters for Kernel 5.15+ -#https://github.com/gnif/vendor-reset/issues/46#issuecomment-992282166 -TARGET_V="5.14.99" -COMPARE="$(uname -r | cut -d '-' -f1) -$TARGET_V" -if [ "$TARGET_V" != "$(echo "$COMPARE" | sort -V | tail -1)" ]; then - while read -r line - do - echo 'device_specific' > $(find /sys/bus/pci/devices/* -name "*$line")/reset_method - done <<< "$(lspci -nn | grep -E "VGA compatible controller|Display controller" | grep -E "AMD|ATI|Advanced Micro Devices" | awk '{print $1}')" -fi - -#Install icon -if [ ! -f "&emhttp;/images/&name;.png" ]; then - if [ ! -d "&emhttp;/images" ]; then - mkdir -p &emhttp;/images - fi - cp &plugin;/&name;.png &emhttp;/images/ -fi -