From c217da74a5621937e7351f646e437bf6234835c5 Mon Sep 17 00:00:00 2001
From: r2k1 <yokree@gmail.com>
Date: Mon, 24 Feb 2025 11:39:44 +1300
Subject: [PATCH] delete amd keys after downloading packages

---
 parts/linux/cloud-init/artifacts/cse_config.sh | 9 +++------
 vhdbuilder/packer/install-dependencies.sh      | 3 +++
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/parts/linux/cloud-init/artifacts/cse_config.sh b/parts/linux/cloud-init/artifacts/cse_config.sh
index a47890a98e6..eec6ad18086 100755
--- a/parts/linux/cloud-init/artifacts/cse_config.sh
+++ b/parts/linux/cloud-init/artifacts/cse_config.sh
@@ -857,14 +857,14 @@ ensureAMDGPUDrivers() {
 ensureAMDGPUDriversUbuntu() {
     echo "Installing AMD GPU drivers"
 
-     # delete amdgpu module from blacklist
-    sudo sed -i '/blacklist amdgpu/d' /etc/modprobe.d/blacklist-radeon-instinct.conf
-
     pushd /var/cache/amdgpu-apt
     ls -l
     sudo dpkg -i *.deb
     popd
 
+     # delete amdgpu module from blacklist
+    sudo sed -i '/blacklist amdgpu/d' /etc/modprobe.d/blacklist-radeon-instinct.conf
+
     REBOOTREQUIRED=true
     echo "AMD GPU drivers installed"
 }
@@ -878,9 +878,6 @@ cleanAMDGPUDriver() {
 }
 
 cleanAMDGPUDriverUbuntu() {
-   # delete amd from a list of recognized vendors
-   sudo rm /etc/apt/keyrings/rocm.gpg
-   sudo rm /etc/apt/sources.list.d/amdgpu.list
    # delete cached amd gpu packages to save disk space
    sudo rm -rf /var/cache/amdgpu-apt/*
 }
diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh
index 7dd413b198a..788522dcc9d 100644
--- a/vhdbuilder/packer/install-dependencies.sh
+++ b/vhdbuilder/packer/install-dependencies.sh
@@ -654,6 +654,9 @@ downloadAMDGPUDriversUbuntu() {
   # Otherwise installation of some packages like "m4" is skipped because it is already installed
   # "m4" seems to be deleted at the later stage, making the installation fail
   sudo apt-get install -o Dir::Cache::Archives="/var/cache/amdgpu-apt" --download-only --reinstall -y m4 amdgpu-dkms autoconf automake autotools-dev amdgpu-dkms-firmware
+  # delete amd from a list of recognized vendors
+  sudo rm /etc/apt/keyrings/rocm.gpg
+  sudo rm /etc/apt/sources.list.d/amdgpu.list
 }
 
 downloadAMDGPUDrivers() {