From 768d98eed5f18c63fd36e33884fbbeb6855653cd Mon Sep 17 00:00:00 2001 From: Hinara Turevel Date: Thu, 26 Mar 2020 06:00:37 +0100 Subject: [PATCH 1/6] Manage new configuration via port field --- ubuntu/20.04/install.sh | 108 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 108 insertions(+) create mode 100644 ubuntu/20.04/install.sh diff --git a/ubuntu/20.04/install.sh b/ubuntu/20.04/install.sh new file mode 100644 index 0000000..ba0bfc3 --- /dev/null +++ b/ubuntu/20.04/install.sh @@ -0,0 +1,108 @@ +#!/bin/bash + +# +# This script is for Ubuntu 18.04 Bionic Beaver to download and install XRDP+XORGXRDP via +# source. +# +# Major thanks to: http://c-nergy.be/blog/?p=11336 for the tips. +# + +############################################################################### +# Use HWE kernel packages +# +HWE="" +#HWE="-hwe-18.04" + +############################################################################### +# Update our machine to the latest code if we need to. +# + +if [ "$(id -u)" -ne 0 ]; then + echo 'This script must be run with root privileges' >&2 + exit 1 +fi + +apt update && apt upgrade -y + +if [ -f /var/run/reboot-required ]; then + echo "A reboot is required in order to proceed with the install." >&2 + echo "Please reboot and re-run this script to finish the install." >&2 + exit 1 +fi + +############################################################################### +# XRDP +# + +# Install hv_kvp utils +apt install -y linux-tools-virtual${HWE} +apt install -y linux-cloud-tools-virtual${HWE} + +# Install the xrdp service so we have the auto start behavior +apt install -y xrdp + +systemctl stop xrdp +systemctl stop xrdp-sesman + +# Configure the installed XRDP ini files. +# use vsock transport. +sed -i_orig -e 's/port=3389/port=vsock:\/\/-1:3389/g' /etc/xrdp/xrdp.ini +# use rdp security. +sed -i_orig -e 's/security_layer=negotiate/security_layer=rdp/g' /etc/xrdp/xrdp.ini +# remove encryption validation. +sed -i_orig -e 's/crypt_level=high/crypt_level=none/g' /etc/xrdp/xrdp.ini +# disable bitmap compression since its local its much faster +sed -i_orig -e 's/bitmap_compression=true/bitmap_compression=false/g' /etc/xrdp/xrdp.ini + +# Add script to setup the ubuntu session properly +if [ ! -e /etc/xrdp/startubuntu.sh ]; then +cat >> /etc/xrdp/startubuntu.sh << EOF +#!/bin/sh +export GNOME_SHELL_SESSION_MODE=ubuntu +export XDG_CURRENT_DESKTOP=ubuntu:GNOME +exec /etc/xrdp/startwm.sh +EOF +chmod a+x /etc/xrdp/startubuntu.sh +fi + +# use the script to setup the ubuntu session +sed -i_orig -e 's/startwm/startubuntu/g' /etc/xrdp/sesman.ini + +# rename the redirected drives to 'shared-drives' +sed -i -e 's/FuseMountName=thinclient_drives/FuseMountName=shared-drives/g' /etc/xrdp/sesman.ini + +# Changed the allowed_users +sed -i_orig -e 's/allowed_users=console/allowed_users=anybody/g' /etc/X11/Xwrapper.config + +# Blacklist the vmw module +if [ ! -e /etc/modprobe.d/blacklist_vmw_vsock_vmci_transport.conf ]; then +cat >> /etc/modprobe.d/blacklist_vmw_vsock_vmci_transport.conf < /etc/modules-load.d/hv_sock.conf +fi + +# Configure the policy xrdp session +cat > /etc/polkit-1/localauthority/50-local.d/45-allow-colord.pkla < Date: Tue, 5 May 2020 01:38:38 +0200 Subject: [PATCH 2/6] Update comment to 20.04 Linux-cloud-tools packages are now available for 20.04 --- ubuntu/20.04/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/20.04/install.sh b/ubuntu/20.04/install.sh index ba0bfc3..ab0beea 100644 --- a/ubuntu/20.04/install.sh +++ b/ubuntu/20.04/install.sh @@ -11,7 +11,7 @@ # Use HWE kernel packages # HWE="" -#HWE="-hwe-18.04" +#HWE="-hwe-20.04" ############################################################################### # Update our machine to the latest code if we need to. From cb07b3eaeb89822ebc6eaddb10f3932bb1879f47 Mon Sep 17 00:00:00 2001 From: Hinara Date: Tue, 5 May 2020 01:39:18 +0200 Subject: [PATCH 3/6] Forgot to change version in a comment --- ubuntu/20.04/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/20.04/install.sh b/ubuntu/20.04/install.sh index ab0beea..9b46992 100644 --- a/ubuntu/20.04/install.sh +++ b/ubuntu/20.04/install.sh @@ -1,7 +1,7 @@ #!/bin/bash # -# This script is for Ubuntu 18.04 Bionic Beaver to download and install XRDP+XORGXRDP via +# This script is for Ubuntu 20.04 Focal Fossa to download and install XRDP+XORGXRDP via # source. # # Major thanks to: http://c-nergy.be/blog/?p=11336 for the tips. From 3d09c3efd709043848b2931a7d646d9574809ec7 Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Sat, 24 Oct 2020 16:24:05 +0200 Subject: [PATCH 4/6] Make blacklist filename consistent --- ubuntu/20.04/install.sh | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/ubuntu/20.04/install.sh b/ubuntu/20.04/install.sh index 9b46992..920ea20 100644 --- a/ubuntu/20.04/install.sh +++ b/ubuntu/20.04/install.sh @@ -75,15 +75,13 @@ sed -i -e 's/FuseMountName=thinclient_drives/FuseMountName=shared-drives/g' /etc sed -i_orig -e 's/allowed_users=console/allowed_users=anybody/g' /etc/X11/Xwrapper.config # Blacklist the vmw module -if [ ! -e /etc/modprobe.d/blacklist_vmw_vsock_vmci_transport.conf ]; then -cat >> /etc/modprobe.d/blacklist_vmw_vsock_vmci_transport.conf < /etc/modprobe.d/blacklist-vmw_vsock_vmci_transport.conf fi #Ensure hv_sock gets loaded if [ ! -e /etc/modules-load.d/hv_sock.conf ]; then -echo "hv_sock" > /etc/modules-load.d/hv_sock.conf + echo "hv_sock" > /etc/modules-load.d/hv_sock.conf fi # Configure the policy xrdp session From 19ae5b9e10fa2190725d116644163f0f22dfd34d Mon Sep 17 00:00:00 2001 From: Hinara Date: Tue, 31 Aug 2021 11:42:25 +0200 Subject: [PATCH 5/6] Fix typo --- ubuntu/20.04/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu/20.04/install.sh b/ubuntu/20.04/install.sh index 920ea20..51a4b32 100644 --- a/ubuntu/20.04/install.sh +++ b/ubuntu/20.04/install.sh @@ -76,7 +76,7 @@ sed -i_orig -e 's/allowed_users=console/allowed_users=anybody/g' /etc/X11/Xwrapp # Blacklist the vmw module if [ ! -e /etc/modprobe.d/blacklist-vmw_vsock_vmci_transport.conf ]; then - echo blacklist vmw_vsock_vmci_transport" > /etc/modprobe.d/blacklist-vmw_vsock_vmci_transport.conf + echo "blacklist vmw_vsock_vmci_transport" > /etc/modprobe.d/blacklist-vmw_vsock_vmci_transport.conf fi #Ensure hv_sock gets loaded From 5a9e2654c3afa0c58aff139cbba6eff90e088e75 Mon Sep 17 00:00:00 2001 From: Kok-Yan Lo Date: Tue, 22 Feb 2022 19:51:28 +1100 Subject: [PATCH 6/6] Add beta support for Ubuntu 22.04 --- ubuntu/22.04/install.sh | 106 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 106 insertions(+) create mode 100755 ubuntu/22.04/install.sh diff --git a/ubuntu/22.04/install.sh b/ubuntu/22.04/install.sh new file mode 100755 index 0000000..0185418 --- /dev/null +++ b/ubuntu/22.04/install.sh @@ -0,0 +1,106 @@ +#!/bin/bash + +# +# This script is for Ubuntu 22.04 Jammy Jellyfish to download and install XRDP+XORGXRDP via +# source. +# +# Major thanks to: http://c-nergy.be/blog/?p=11336 for the tips. +# + +############################################################################### +# Use HWE kernel packages +# +HWE="" +#HWE="-hwe-22.04" + +############################################################################### +# Update our machine to the latest code if we need to. +# + +if [ "$(id -u)" -ne 0 ]; then + echo 'This script must be run with root privileges' >&2 + exit 1 +fi + +apt update && apt upgrade -y + +if [ -f /var/run/reboot-required ]; then + echo "A reboot is required in order to proceed with the install." >&2 + echo "Please reboot and re-run this script to finish the install." >&2 + exit 1 +fi + +############################################################################### +# XRDP +# + +# Install hv_kvp utils +apt install -y linux-tools-virtual${HWE} +apt install -y linux-cloud-tools-virtual${HWE} + +# Install the xrdp service so we have the auto start behavior +apt install -y xrdp + +systemctl stop xrdp +systemctl stop xrdp-sesman + +# Configure the installed XRDP ini files. +# use vsock transport. +sed -i_orig -e 's/port=3389/port=vsock:\/\/-1:3389/g' /etc/xrdp/xrdp.ini +# use rdp security. +sed -i_orig -e 's/security_layer=negotiate/security_layer=rdp/g' /etc/xrdp/xrdp.ini +# remove encryption validation. +sed -i_orig -e 's/crypt_level=high/crypt_level=none/g' /etc/xrdp/xrdp.ini +# disable bitmap compression since its local its much faster +sed -i_orig -e 's/bitmap_compression=true/bitmap_compression=false/g' /etc/xrdp/xrdp.ini + +# Add script to setup the ubuntu session properly +if [ ! -e /etc/xrdp/startubuntu.sh ]; then +cat >> /etc/xrdp/startubuntu.sh << EOF +#!/bin/sh +export GNOME_SHELL_SESSION_MODE=ubuntu +export XDG_CURRENT_DESKTOP=ubuntu:GNOME +exec /etc/xrdp/startwm.sh +EOF +chmod a+x /etc/xrdp/startubuntu.sh +fi + +# use the script to setup the ubuntu session +sed -i_orig -e 's/startwm/startubuntu/g' /etc/xrdp/sesman.ini + +# rename the redirected drives to 'shared-drives' +sed -i -e 's/FuseMountName=thinclient_drives/FuseMountName=shared-drives/g' /etc/xrdp/sesman.ini + +# Changed the allowed_users +sed -i_orig -e 's/allowed_users=console/allowed_users=anybody/g' /etc/X11/Xwrapper.config + +# Blacklist the vmw module +if [ ! -e /etc/modprobe.d/blacklist-vmw_vsock_vmci_transport.conf ]; then + echo "blacklist vmw_vsock_vmci_transport" > /etc/modprobe.d/blacklist-vmw_vsock_vmci_transport.conf +fi + +#Ensure hv_sock gets loaded +if [ ! -e /etc/modules-load.d/hv_sock.conf ]; then + echo "hv_sock" > /etc/modules-load.d/hv_sock.conf +fi + +# Configure the policy xrdp session +cat > /etc/polkit-1/localauthority/50-local.d/45-allow-colord.pkla <