Skip to content

Commit

Permalink
Drop the hack for Ubuntu 18.10, as there are ONE packages already
Browse files Browse the repository at this point in the history
  • Loading branch information
xorel committed Mar 5, 2019
1 parent 7b4d1d3 commit fbb981a
Showing 1 changed file with 5 additions and 7 deletions.
12 changes: 5 additions & 7 deletions minione
Original file line number Diff line number Diff line change
Expand Up @@ -284,9 +284,9 @@ repo_exists() {
return 1
else
if type curl >/dev/null 2>&1; then
curl -q -f -s https://downloads.opennebula.org/repo/${VERSION}/${DISTNAME}/${INSTALLVER} >/dev/null
curl -q -f -s https://downloads.opennebula.org/repo/${VERSION}/${DISTNAME}/${DISTVER} >/dev/null
elif type wget >/dev/null 2>&1; then
wget --quiet -O /dev/null https://downloads.opennebula.org/repo/${VERSION}/${DISTNAME}/${INSTALLVER}
wget --quiet -O /dev/null https://downloads.opennebula.org/repo/${VERSION}/${DISTNAME}/${DISTVER}
else
echo "Missing curl/wget to check repository" >&2
return 2
Expand Down Expand Up @@ -470,7 +470,7 @@ configure_repos() {
cat << EOT > /etc/yum.repos.d/opennebula.repo
[opennebula]
name=opennebula
baseurl=https://downloads.opennebula.org/repo/${VERSION}/${DISTNAME}/${INSTALLVER}/x86_64
baseurl=https://downloads.opennebula.org/repo/${VERSION}/${DISTNAME}/${DISTVER}/x86_64
enabled=1
gpgkey=https://downloads.opennebula.org/repo/repo.key
gpgcheck=1
Expand All @@ -482,7 +482,7 @@ EOT
else
( wget -q -O- https://downloads.opennebula.org/repo/repo.key | \
apt-key add - >/dev/null 2>&1 ) || return 1
echo "deb https://downloads.opennebula.org/repo/${VERSION}/${DISTNAME}/${INSTALLVER} stable opennebula" \
echo "deb https://downloads.opennebula.org/repo/${VERSION}/${DISTNAME}/${DISTVER} stable opennebula" \
> /etc/apt/sources.list.d/opennebula.list || return 1
fi
fi
Expand Down Expand Up @@ -568,9 +568,7 @@ uninstall_opennebula_pkgs() {
# Initialize some usefull vars
NETMASK_BITS=$(mask2cidr ${VNET_NETMASK})
read -r DISTNAME DISTVER <<<$(get_distname_and_version)
# some version fixes
INSTALLVER=$DISTVER
[[ "${DISTNAME}${DISTVER}" = 'Ubuntu18.10' ]] && INSTALLVER='18.04'

[[ "${DISTNAME}${DISTVER}" =~ Ubuntu16.04|Ubuntu18.04 ]] && LIBVIRTD="libvirt-bin"


Expand Down

0 comments on commit fbb981a

Please sign in to comment.