dcv script

Author: hgreebe

cookbooks/aws-parallelcluster-platform/files/dcv/pcluster_dcv_connect.sh

@@ -112,7 +112,7 @@ main() {
     os=$(< /etc/chef/dna.json jq -r .cluster.base_os)
     _log "Input parameters: user: ${user}, OS: ${os}, shared_folder_path: ${shared_folder_path}."
 
-    if ! [[ "${os}" =~ ^(alinux2|alinux2023|ubuntu2004|ubuntu2204|rhel8|rocky8|rhel9|rocky9)$ ]]; then
+    if ! [[ "${os}" =~ ^(alinux2|alinux2023|ubuntu2004|ubuntu2204|ubuntu2404|rhel8|rocky8|rhel9|rocky9)$ ]]; then
         _fail "OS not supported."
     fi
 

cookbooks/aws-parallelcluster-platform/resources/dcv/partial/_ubuntu_common.rb

@@ -42,11 +42,10 @@ def pre_install
       # Must purge ifupdown before creating the AMI or the instance will have an ssh failure
       # Run dpkg --configure -a if there is a `dpkg interrupted` issue when installing ubuntu-desktop
       code <<-PREREQ
-        set -x
+        set -e
         DEBIAN_FRONTEND=noninteractive
         apt -y install whoopsie
-        apt -y install ubuntu-desktop
-        echo $?
+        apt -y install ubuntu-desktop && apt -y install mesa-utils || (dpkg --configure -a && exit 1)
         apt -y purge ifupdown
         wget https://d1uj6qtbmh3dt5.cloudfront.net/NICE-GPG-KEY
         gpg --import NICE-GPG-KEY