From a798cb5365eb36c1042e6a22fb017c52273f46ec Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Wed, 12 Mar 2025 11:25:16 -0400 Subject: [PATCH 1/3] Chore: Prevent unraid.patch (original) from installing on 7.1.0+ --- etc/rc.d/rc.local | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/rc.d/rc.local b/etc/rc.d/rc.local index c716f490b..5f196ef50 100755 --- a/etc/rc.d/rc.local +++ b/etc/rc.d/rc.local @@ -90,7 +90,7 @@ rm -f /boot/plugins/unRAIDServer.plg rm -f $CONFIG/plugins/unRAIDServer.plg # These plugins are now integrated in the OS or obsolete and may interfere -OBSOLETE="vfio.pci dynamix.wireguard dynamix.ssd.trim dynamix.file.manager gui.search unlimited-width proxy.editor" +OBSOLETE="vfio.pci dynamix.wireguard dynamix.ssd.trim dynamix.file.manager gui.search unlimited-width proxy.editor unraid.patch.plg" for PLUGIN in $OBSOLETE; do if [[ -e $CONFIG/plugins/$PLUGIN.plg ]]; then log "moving obsolete plugin $PLUGIN.plg to $CONFIG/plugins-error" @@ -161,7 +161,7 @@ else log "Installing /boot/extra packages" ( export -f log; find /boot/extra -maxdepth 1 -type f -exec sh -c 'upgradepkg --terse --install-new "$1" | log' -- "{}" \; ) fi - PRIORITY_PLUGINS=("unraid.patch.plg" "dynamix.unraid.net.plg" "dynamix.unraid.net.staging.plg") + PRIORITY_PLUGINS=("dynamix.unraid.net.plg" "dynamix.unraid.net.staging.plg") # Install priority plugins first for PRIORITY_PLUGIN in "${PRIORITY_PLUGINS[@]}"; do PRIORITY_PLUGIN_PATH="$CONFIG/plugins/$PRIORITY_PLUGIN" From e499fd9d36b3480b7a60e3ce4a7368ec2b7cb794 Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Wed, 12 Mar 2025 11:30:42 -0400 Subject: [PATCH 2/3] Prevent patch boot loader from running --- etc/rc.d/rc.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/rc.d/rc.local b/etc/rc.d/rc.local index 5f196ef50..5ef9d33f6 100755 --- a/etc/rc.d/rc.local +++ b/etc/rc.d/rc.local @@ -90,7 +90,7 @@ rm -f /boot/plugins/unRAIDServer.plg rm -f $CONFIG/plugins/unRAIDServer.plg # These plugins are now integrated in the OS or obsolete and may interfere -OBSOLETE="vfio.pci dynamix.wireguard dynamix.ssd.trim dynamix.file.manager gui.search unlimited-width proxy.editor unraid.patch.plg" +OBSOLETE="vfio.pci dynamix.wireguard dynamix.ssd.trim dynamix.file.manager gui.search unlimited-width proxy.editor unraid.patch AAA-UnraidPatch-BootLoader-DO_NOT_DELETE" for PLUGIN in $OBSOLETE; do if [[ -e $CONFIG/plugins/$PLUGIN.plg ]]; then log "moving obsolete plugin $PLUGIN.plg to $CONFIG/plugins-error" From ce5b65209f58a094d175ccb0d90eb1769c14853d Mon Sep 17 00:00:00 2001 From: Squidly271 Date: Tue, 18 Mar 2025 17:26:40 -0400 Subject: [PATCH 3/3] Remove unraid.net staging plugin from priority install --- etc/rc.d/rc.local | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/etc/rc.d/rc.local b/etc/rc.d/rc.local index 5ef9d33f6..f8fba4d43 100755 --- a/etc/rc.d/rc.local +++ b/etc/rc.d/rc.local @@ -161,7 +161,7 @@ else log "Installing /boot/extra packages" ( export -f log; find /boot/extra -maxdepth 1 -type f -exec sh -c 'upgradepkg --terse --install-new "$1" | log' -- "{}" \; ) fi - PRIORITY_PLUGINS=("dynamix.unraid.net.plg" "dynamix.unraid.net.staging.plg") + PRIORITY_PLUGINS=("dynamix.unraid.net.plg") # Install priority plugins first for PRIORITY_PLUGIN in "${PRIORITY_PLUGINS[@]}"; do PRIORITY_PLUGIN_PATH="$CONFIG/plugins/$PRIORITY_PLUGIN"