From 034f4ec135e5639488edf6e0902a73e4f91fb618 Mon Sep 17 00:00:00 2001
From: Sylvain Boily <4981802+djsly@users.noreply.github.com>
Date: Fri, 18 Oct 2024 16:00:01 -0400
Subject: [PATCH] removing more stderr and issues during build

---
 vhdbuilder/packer/install-dependencies.sh | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/vhdbuilder/packer/install-dependencies.sh b/vhdbuilder/packer/install-dependencies.sh
index 1b9870ed4f2..5f49de424ff 100644
--- a/vhdbuilder/packer/install-dependencies.sh
+++ b/vhdbuilder/packer/install-dependencies.sh
@@ -372,6 +372,7 @@ if [[ $OS == $UBUNTU_OS_NAME && $(isARM64) != 1 ]]; then  # no ARM64 SKU with GP
 
   mkdir -p /opt/{actions,gpu}
   pullContainerImage "crictl" $NVIDIA_DRIVER_IMAGE:$NVIDIA_DRIVER_IMAGE_TAG
+  echo "  - nvidia-driver=${NVIDIA_DRIVER_IMAGE_TAG}" >> ${VHD_LOGS_FILEPATH}
   if grep -q "fullgpu" <<< "$FEATURE_FLAGS"; then
     bash -c "$CTR_GPU_INSTALL_CMD $NVIDIA_DRIVER_IMAGE:$NVIDIA_DRIVER_IMAGE_TAG gpuinstall /entrypoint.sh install"
     ret=$?
@@ -379,12 +380,10 @@ if [[ $OS == $UBUNTU_OS_NAME && $(isARM64) != 1 ]]; then  # no ARM64 SKU with GP
       echo "Failed to install GPU driver, exiting..."
       exit $ret
     fi
+    ls -ltr /opt/gpu/* >> ${VHD_LOGS_FILEPATH}
   fi
 
-  cat << EOF >> ${VHD_LOGS_FILEPATH}
-  - nvidia-driver=${NVIDIA_DRIVER_IMAGE_TAG}
-EOF
-ls -ltr /opt/gpu/* >> ${VHD_LOGS_FILEPATH}
+
 capture_benchmark "${SCRIPT_NAME}_pull_and_install_nvidia_driver_image"
 fi
 
@@ -484,7 +483,7 @@ capture_benchmark "${SCRIPT_NAME}_configure_networking_and_interface"
 mkdir -p /var/log/azure/Microsoft.Azure.Extensions.CustomScript/events
 
 # Disable cgroup-memory-telemetry on AzureLinux due to incompatibility with cgroup2fs driver and absence of required azure.slice directory
-if [ ! isMarinerOrAzureLinux "$OS" ]; then
+if ! isMarinerOrAzureLinux "$OS" ; then
   systemctlEnableAndStart cgroup-memory-telemetry.timer || exit 1
   systemctl enable cgroup-memory-telemetry.service || exit 1
   systemctl restart cgroup-memory-telemetry.service