mirror/XenOrchestraInstallerUpdater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #41 from davidsenk/master

Browse Source 
Fix for ubuntu 20
This commit is contained in:
Roni Väyrynen
2020-05-11 16:47:06 +03:00
committed by GitHub
parent 19c969646d 1ddef1efbf
commit dea98d564b
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -71,6 +71,7 @@ Installation works but not tested frequently:
- Debian 8 - Debian 8
- Debian 9 - Debian 9
- Ubuntu 16.04 - Ubuntu 16.04
- Ubuntu 20.04
In order to use file level restore from delta backups, the service needs to be ran as root. In order to use file level restore from delta backups, the service needs to be ran as root.
CentOS installation is currently not able to do file level restore if the backed up disk contains LVM or only sees some of the partitions. CentOS installation is currently not able to do file level restore if the backed up disk contains LVM or only sees some of the partitions.
@@ -116,6 +117,7 @@ Debian/Ubuntu:
- libpng-dev - libpng-dev
- git - git
- python-minimal - python-minimal
- python2-minimal (Ubuntu 20 only, replaces python-minimal)
- libvhdi-utils - libvhdi-utils
- lvm2 - lvm2
- nfs-common - nfs-common

20
xo-install.sh
View File

@@ -149,7 +149,7 @@ function InstallDependenciesDebian {
# Install necessary dependencies for XO build # Install necessary dependencies for XO build
if [[ $OSVERSION =~ (16|18) ]]; then if [[ $OSVERSION =~ (16|18|20) ]]; then
echo -ne "${PROGRESS} OS Ubuntu so making sure universe repository is enabled" echo -ne "${PROGRESS} OS Ubuntu so making sure universe repository is enabled"
add-apt-repository universe >/dev/null add-apt-repository universe >/dev/null
echo -e "\r${OK} OS Ubuntu so making sure universe repository is enabled" echo -e "\r${OK} OS Ubuntu so making sure universe repository is enabled"
@@ -222,11 +222,18 @@ function InstallDependenciesDebian {
echo -e "\r${OK} Installing node.js" echo -e "\r${OK} Installing node.js"
fi fi
fi fi
#determine which python package is needed. Ubuntu 20 requires python2-minimal, 16 and 18 are python-minimal
if [[ $OSVERSION == "20" ]]; then
PYTHON="python2-minimal"
else
PYTHON="python-minimal"
fi
# install packages # install packages
echo echo
echo -ne "${PROGRESS} Installing build dependencies, redis server, python, git, libvhdi-utils, lvm2, nfs-common, cifs-utils" echo -ne "${PROGRESS} Installing build dependencies, redis server, git, libvhdi-utils, python-minimal, lvm2, nfs-common, cifs-utils"
apt-get install -y build-essential redis-server libpng-dev git python-minimal libvhdi-utils lvm2 nfs-common cifs-utils >/dev/null apt-get install -y build-essential redis-server libpng-dev git libvhdi-utils $PYTHON lvm2 nfs-common cifs-utils >/dev/null
echo -e "\r${OK} Installing build dependencies, redis server, python, git, libvhdi-utils, lvm2, nfs-common, cifs-utils" echo -e "\r${OK} Installing build dependencies, redis server, python, git, libvhdi-utils, lvm2, nfs-common, cifs-utils"
echo echo
@@ -472,6 +479,7 @@ function InstallXO {
echo -e "${INFO} Activating modified configuration file" echo -e "${INFO} Activating modified configuration file"
mkdir -p $CONFIGPATH/.config/xo-server mkdir -p $CONFIGPATH/.config/xo-server
mv -f $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/sample.config.toml $CONFIGPATH/.config/xo-server/config.toml mv -f $INSTALLDIR/xo-builds/xen-orchestra-$TIME/packages/xo-server/sample.config.toml $CONFIGPATH/.config/xo-server/config.toml
fi fi
@@ -490,6 +498,8 @@ function InstallXO {
fi fi
chown -R $XOUSER:$XOUSER /var/lib/xo-server chown -R $XOUSER:$XOUSER /var/lib/xo-server
chown -R $XOUSER:$XOUSER $CONFIGPATH/.config/xo-server
fi fi
# fix to prevent older installations to not update because systemd service is not symlinked anymore # fix to prevent older installations to not update because systemd service is not symlinked anymore
@@ -642,8 +652,8 @@ function CheckOS {
if [[ $OSNAME == "Debian" ]] && [[ ! $OSVERSION =~ ^(8|9|10)$ ]]; then if [[ $OSNAME == "Debian" ]] && [[ ! $OSVERSION =~ ^(8|9|10)$ ]]; then
echo -e "${FAIL} Only Debian 8/9/10 supported" echo -e "${FAIL} Only Debian 8/9/10 supported"
exit 0 exit 0
elif [[ $OSNAME == "Ubuntu" ]] && [[ ! $OSVERSION =~ ^(16|18)$ ]]; then elif [[ $OSNAME == "Ubuntu" ]] && [[ ! $OSVERSION =~ ^(16|18|20)$ ]]; then
echo -e "${FAIL} Only Ubuntu 16/18 supported" echo -e "${FAIL} Only Ubuntu 16/18/20 supported"
exit 0 exit 0
fi fi
else else