From c5ce11b550e29c13881bc2ada49c18893ae1c716 Mon Sep 17 00:00:00 2001 From: tim-allen-ck Date: Fri, 12 Apr 2024 10:43:48 +0100 Subject: [PATCH] update config --- .../user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf | 1 + .../guacamole-azure-linuxvm/terraform/vm_config.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf index d45d5d3a00..a2756de06d 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/linuxvm.tf @@ -110,6 +110,7 @@ data "template_file" "vm_config" { FILESHARE_NAME = var.shared_storage_access ? data.azurerm_storage_share.shared_storage[0].name : "" NEXUS_PROXY_URL = local.nexus_proxy_url CONDA_CONFIG = local.selected_image.conda_config ? 1 : 0 + VM_USER = random_string.username.result } } diff --git a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh index 2594b6adbe..2a2794f72c 100644 --- a/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh +++ b/templates/workspace_services/guacamole/user_resources/guacamole-azure-linuxvm/terraform/vm_config.sh @@ -20,6 +20,7 @@ sudo adduser xrdp ssl-cert if [ "${INSTALL_UI}" -eq 1 ]; then sudo apt-get install xorg xfce4 xfce4-goodies dbus-x11 x11-xserver-utils -y echo xfce4-session > ~/.xsession + sudo su - ${VM_USER} -c "echo xfce4-session > ~/.xsession" fi # Fix for blank screen on DSVM (/sh -> /bash due to conflict with profile.d scripts)