From 0a4b5887ca570e70085c436d11fc4482152a6664 Mon Sep 17 00:00:00 2001
From: ronivay <roni@vayrynen.info>
Date: Thu, 21 Mar 2019 14:07:51 +0200
Subject: [PATCH] add support for Ubuntu 18

---
 README.md                | 6 +++++-
 tests/Ubuntu/Vagrantfile | 2 +-
 xo-install.sh            | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 2664df8..2a29dcd 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 
 # In a nutshell
 
-This repo consist of script to install and update [Xen Orchestra](https://xen-orchestra.com/#!/) for CentOS 7/Ubuntu 16/Debian 8 & 9
+This repo consist of script to install and update [Xen Orchestra](https://xen-orchestra.com/#!/) for CentOS 7/Ubuntu 18/Debian 9
 
 Installation is done using latest xo-server and xo-web sources by default. With this method Xen-Orchestra has all features unlocked which are normally available only with monthly fee.
 
@@ -60,6 +60,10 @@ Tool has been tested to work with following distros:
 
 - CentOS 7 (note LVM file level restore issue from below)
 - Debian 9
+- Ubuntu 18.04
+
+Installation works but not tested frequently:
+- Debian 8
 - Ubuntu 16.04
 
 In order to use file level restore from delta backups, the service needs to be ran as root.
diff --git a/tests/Ubuntu/Vagrantfile b/tests/Ubuntu/Vagrantfile
index 18b574a..d1ffbc8 100644
--- a/tests/Ubuntu/Vagrantfile
+++ b/tests/Ubuntu/Vagrantfile
@@ -12,7 +12,7 @@ Vagrant.configure(2) do |config|
 
   # Every Vagrant development environment requires a box. You can search for
   # boxes at https://atlas.hashicorp.com/search.
-  config.vm.box = "ubuntu/xenial64"
+  config.vm.box = "ubuntu/bionic64"
 
   # Disable automatic box update checking. If you disable this, then
   # boxes will only be checked for updates when the user runs
diff --git a/xo-install.sh b/xo-install.sh
index 54011a5..cb2e7e0 100755
--- a/xo-install.sh
+++ b/xo-install.sh
@@ -610,12 +610,12 @@ function CheckOS {
 		if [[ $OSNAME == "Debian" ]] && [[ ! $OSVERSION =~ ^(8|9)$ ]]; then
 			echo "Only Debian 8/9 supported"
 			exit 0
-		elif [[ $OSNAME == "Ubuntu" ]] && [[ ! $OSVERSION == "16" ]]; then
-			echo "Only Ubuntu 16 supported"
+		elif [[ $OSNAME == "Ubuntu" ]] && [[ ! $OSVERSION =~ ^(16|18)$ ]]; then
+			echo "Only Ubuntu 16/18 supported"
 			exit 0
 		fi
 	else
-		echo "Only CentOS 7 / Ubuntu 16 and Debian 8/9 supported"
+		echo "Only CentOS 7 / Ubuntu 16/18 and Debian 8/9 supported"
 		exit 0
 	fi