From e0fa7728ee34697bedc5057d0acd9b5276bfdebf Mon Sep 17 00:00:00 2001
From: Kalibh Halford <kalibh.halford@stfc.ac.uk>
Date: Thu, 15 Jan 2026 14:58:21 +0000
Subject: [PATCH] BUG: Fix grub config for BIOS

Grub BIOS config was never triggered as the /boot/efi exists in the generic cloud image regardless of bios or uefi boot. Also, the path to the bios grub config was incorrect and not making the grub config in the right place. With these changes the grub config should be set for both uefi and bios so that no matter what boot mode used when building the image, if the machine changes boot later on it should still have the grub config.
---
 .../roles/image_fixes/tasks/nvidia-pci.yml    | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/os_builders/roles/image_fixes/tasks/nvidia-pci.yml b/os_builders/roles/image_fixes/tasks/nvidia-pci.yml
index a50cecf..202a6e3 100644
--- a/os_builders/roles/image_fixes/tasks/nvidia-pci.yml
+++ b/os_builders/roles/image_fixes/tasks/nvidia-pci.yml
@@ -43,11 +43,21 @@
       mode: '0644'
     register: grub_updated
 
-  - name: Check if we're booted with UEFI
-    # While RH makes this easy to check, Debian based systems don't have a
-    # symlink or similar so we have to do the legwork ourselves
-    set_fact:
-      uefi_boot: "{{ ansible_mounts | selectattr('mount', 'equalto', '/boot/efi') | list | length > 0 }}"
+- name: Check if machine supports UEFI boot
+  become: true
+  # While RH makes this easy to check, Debian based systems don't have a
+  # symlink or similar so we have to do the legwork ourselves
+  ansible.builtin.stat:
+    path: /boot/efi/EFI
+  register: efi_dir
+
+- name: Check if machine supports BIOS boot
+  # While RH makes this easy to check, Debian based systems don't have a
+  # symlink or similar so we have to do the legwork ourselves
+  become: true
+  ansible.builtin.stat:
+    path: /boot/grub
+  register: bios_dir
 
 - name: Check if we are in a container from the GitHub workflows
   ansible.builtin.command: "cat /proc/self/cgroup"
@@ -58,12 +68,12 @@
   become: true
   block:
   - name: Update grub configuration for Debian BIOS boot
-    ansible.builtin.command: "grub-mkconfig -o /boot/grub2/grub.cfg"
-    when: grub_updated.changed and not uefi_boot
+    ansible.builtin.command: "grub-mkconfig -o /boot/grub/grub.cfg"
+    when: grub_updated.changed and bios_dir.stat.exists
 
   - name: Update grub configuration for Debian UEFI boot
     ansible.builtin.command: "grub-mkconfig -o /boot/efi/EFI/{{ ansible_distribution | lower }}/grub.cfg"
-    when: grub_updated.changed and uefi_boot
+    when: grub_updated.changed and efi_dir.stat.exists
 
 - name: Update grub configuration for RedHat based systems
   become: true