From 5082f8ce12e40cf5f0d774a52166a199fbd93866 Mon Sep 17 00:00:00 2001
From: Craig Wilhite <cdwilhite0601@gmail.com>
Date: Tue, 20 Feb 2018 12:32:36 -0800
Subject: [PATCH] Remove Build XRDP, use proposed changes

-XRDP now includes config changes.
-We don't need Billy's PPA, we can just use Ubuntu Proposed archive.
---
 ubuntu/18.04/install.sh | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/ubuntu/18.04/install.sh b/ubuntu/18.04/install.sh
index 75f5958..f0305f9 100644
--- a/ubuntu/18.04/install.sh
+++ b/ubuntu/18.04/install.sh
@@ -11,16 +11,10 @@
 # Update our machine to the latest code if we need to.
 #
 
-sudo apt update
-sudo apt upgrade -y
+sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main multiverse universe" >> /etc/apt/sources.list <<EOF
+EOF'
 
-# Get git if we dont have it.
-sudo apt install -y git
-
-# TODO: Remove the custom kernel logic when 18.04 supports hv_sock by default.
-sudo add-apt-repository ppa:billy-olsen/test-kernels-bionic
-sudo apt-get update
-sudo apt install linux-image-4.14.0-17-generic
+sudo apt update && sudo apt dist-upgrade -y
 
 if [ -f /var/run/reboot-required ]; then
     echo
@@ -34,33 +28,13 @@ fi
 ###############################################################################
 # XRDP
 #
-export XRDP_PATH=~/git/src/github.com/neutrinolabs/xrdp
 
 # Install the xrdp service so we have the auto start behavior
 sudo apt install -y xrdp
 
-# Get XRDP requirements
-# ./bootstrap requirements 'autoconf libtool pkg-config'
-# ./configure requirements 'libssl-dev libpam0g-dev libjpeg-dev libfuse-dev libx11-dev libxfixes-dev libxrandr-dev nasm'
-sudo apt install -y autoconf libtool pkg-config libssl-dev libpam0g-dev libjpeg-dev libfuse-dev libx11-dev libxfixes-dev libxrandr-dev nasm
-
-# Get XRDP
-if [ ! -d $XRDP_PATH ]; then
-    git clone https://github.com/neutrinolabs/xrdp $XRDP_PATH
-fi
-
-# Configure XRDP
-cd $XRDP_PATH
-./bootstrap
-./configure --enable-vsock --enable-jpeg --enable-fuse
-
 sudo systemctl stop xrdp
 sudo systemctl stop xrdp-sesman
 
-# Build/Install XRDP
-make
-sudo make install
-
 # Configure the installed XRDP ini files.
 # use vsock transport.
 sudo sed -i_orig -e 's/use_vsock=false/use_vsock=true/g' /etc/xrdp/xrdp.ini