vim/linux-vm-tools
1
0
Fork 0
forked from mir/linux-vm-tools
Code Pull Requests Activity

Remove Build XRDP, use proposed changes

Browse Source 
-XRDP now includes config changes.
-We don't need Billy's PPA, we can just use Ubuntu Proposed archive.
This commit is contained in:
Craig Wilhite 2018-02-20 12:32:36 -08:00 committed by GitHub
parent a62e669547
commit 5082f8ce12
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ubuntu/18.04/install.sh
View File

@ -11,16 +11,10 @@
# Update our machine to the latest code if we need to. # Update our machine to the latest code if we need to.
# #
sudo apt update sudo bash -c 'echo "deb http://archive.ubuntu.com/ubuntu/ bionic-proposed restricted main multiverse universe" >> /etc/apt/sources.list <<EOF
sudo apt upgrade -y EOF'
# Get git if we dont have it. sudo apt update && sudo apt dist-upgrade -y
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
if [ -f /var/run/reboot-required ]; then if [ -f /var/run/reboot-required ]; then
echo echo
@ -34,33 +28,13 @@ fi
############################################################################### ###############################################################################
# XRDP # XRDP
# #
export XRDP_PATH=~/git/src/github.com/neutrinolabs/xrdp
# Install the xrdp service so we have the auto start behavior # Install the xrdp service so we have the auto start behavior
sudo apt install -y xrdp 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
sudo systemctl stop xrdp-sesman sudo systemctl stop xrdp-sesman
# Build/Install XRDP
make
sudo make install
# Configure the installed XRDP ini files. # Configure the installed XRDP ini files.
# use vsock transport. # use vsock transport.
sudo sed -i_orig -e 's/use_vsock=false/use_vsock=true/g' /etc/xrdp/xrdp.ini sudo sed -i_orig -e 's/use_vsock=false/use_vsock=true/g' /etc/xrdp/xrdp.ini