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

changes per upstream mainters request

Browse Source
This commit is contained in:
Ubuntu
2020-05-11 12:45:57 +00:00
parent 631124d683
commit 1ddef1efbf
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
xo-install.sh
View File

@@ -156,22 +156,6 @@ function InstallDependenciesDebian {
echo
fi
if [[ $OSVERSION =~ (16|18) ]]; then
echo -ne "${PROGRESS} Installing Python for Ubuntu 16 and 18"
apt-get install -y python-minimal >/dev/null
echo -e "\r${OK} Python installed"
echo
fi
if [[ $OSVERSION =~ (20) ]]; then
echo -ne "${PROGRESS} Installing Python for Ubuntu 20"
apt-get install -y python2-minimal >/dev/null
echo -e "\r${OK} Python installed"
echo
fi
echo
echo -ne "${PROGRESS} Running apt-get update"
apt-get update >/dev/null
@@ -238,11 +222,18 @@ function InstallDependenciesDebian {
echo -e "\r${OK} Installing node.js"
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
echo
echo -ne "${PROGRESS} Installing build dependencies, redis server, git, libvhdi-utils, lvm2, nfs-common, cifs-utils"
apt-get install -y build-essential redis-server libpng-dev git libvhdi-utils lvm2 nfs-common cifs-utils >/dev/null
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 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
@@ -488,8 +479,7 @@ function InstallXO {
echo -e "${INFO} Activating modified configuration file"
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
#fix permissions if service is not running as root
chown -R $XOUSER:$XOUSER $CONFIGPATH
fi
@@ -508,6 +498,8 @@ function InstallXO {
fi
chown -R $XOUSER:$XOUSER /var/lib/xo-server
chown -R $XOUSER:$XOUSER $CONFIGPATH/.config/xo-server
fi
# fix to prevent older installations to not update because systemd service is not symlinked anymore