From d8031a32269ef647dfb9997c70e95d355b30b8e6 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sat, 13 Feb 2021 07:19:19 -0600 Subject: [PATCH] Compare to number of results found, not if the command failed. --- tasks/miner/drivers/amdgpu.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/tasks/miner/drivers/amdgpu.yml b/tasks/miner/drivers/amdgpu.yml index 3f12de3..3a40a9b 100644 --- a/tasks/miner/drivers/amdgpu.yml +++ b/tasks/miner/drivers/amdgpu.yml @@ -64,7 +64,7 @@ package: name: linux-image-5.4.0-65-generic state: present - when: amdgpu_install.failed and hwe_kernel.failed and ga_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 and ga_kernel.failed - name: AMDGPU | Prepare To Boot GA Kernel lineinfile: @@ -73,7 +73,7 @@ line: 'GRUB_DEFAULT="Advanced options for Ubuntu>Ubuntu, with Linux 5.4.0-65-generic"' state: present backup: yes - when: amdgpu_install.failed and hwe_kernel.failed and ga_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 and ga_kernel.failed - name: AMDGPU | Prepare Cron Job To SCM cron: @@ -83,15 +83,15 @@ job: "scm.sh" state: present disabled: no - when: amdgpu_install.failed and hwe_kernel.failed and ga_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 and ga_kernel.failed - name: AMDGPU | Reboot To GA Kernel shell: reboot - when: amdgpu_install.failed and hwe_kernel.failed and ga_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 and ga_kernel.failed - pause: prompt: "Rebooting to GA kernel! Please hold." - when: amdgpu_install.failed and hwe_kernel.failed and ga_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 and ga_kernel.failed @@ -104,11 +104,11 @@ linux-modules-5.1* \ linux-modules-5.8.0-* \ linux-modules-5.6.0-*" - when: amdgpu_install.failed and hwe_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 - name: AMDGPU | Update + Clean System shell: "apt update; apt dist-upgrade -y; apt autoremove -y" - when: amdgpu_install.failed and hwe_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 # This is to ensure we can test adding `apt install --install-recommends linux-generic` later - name: AMDGPU | Boot Default Kernel @@ -118,7 +118,7 @@ line: 'GRUB_DEFAULT=0' state: present backup: yes - when: amdgpu_install.failed and hwe_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 - name: AMDGPU | Prepare Cron Job To SCM cron: @@ -128,15 +128,15 @@ job: "scm.sh" state: present disabled: no - when: amdgpu_install.failed and hwe_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 - name: AMDGPU | Reboot To Ensure GA Is 0 shell: reboot - when: amdgpu_install.failed and hwe_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0 - pause: prompt: "Rebooting to clear kernels! Please hold." - when: amdgpu_install.failed and hwe_kernel.failed + when: amdgpu_install.failed and hwe_kernel.stdout > 0