Add "KVM for IBM z Systems" to the list of Fedora-like distros.
As the distribution does not have a dedicated kvm package,
prevent the installation of the kvm package during the libvirt
setup.
Change-Id: Ibb5c60797d6867264f9dea7fea85cdf1d7c72ded
... | ... |
@@ -410,6 +410,8 @@ function GetDistro { |
410 | 410 |
DISTRO="rhel${os_RELEASE::1}" |
411 | 411 |
elif [[ "$os_VENDOR" =~ (XenServer) ]]; then |
412 | 412 |
DISTRO="xs$os_RELEASE" |
413 |
+ elif [[ "$os_VENDOR" =~ (kvmibm) ]]; then |
|
414 |
+ DISTRO="${os_VENDOR}${os_RELEASE::1}" |
|
413 | 415 |
else |
414 | 416 |
# Catch-all for now is Vendor + Release + Update |
415 | 417 |
DISTRO="$os_VENDOR-$os_RELEASE.$os_UPDATE" |
... | ... |
@@ -444,7 +446,7 @@ function is_fedora { |
444 | 444 |
|
445 | 445 |
[ "$os_VENDOR" = "Fedora" ] || [ "$os_VENDOR" = "Red Hat" ] || \ |
446 | 446 |
[ "$os_VENDOR" = "CentOS" ] || [ "$os_VENDOR" = "OracleLinux" ] || \ |
447 |
- [ "$os_VENDOR" = "CloudLinux" ] |
|
447 |
+ [ "$os_VENDOR" = "CloudLinux" ] || [ "$os_VENDOR" = "kvmibm" ] |
|
448 | 448 |
} |
449 | 449 |
|
450 | 450 |
|
... | ... |
@@ -38,7 +38,10 @@ function install_libvirt { |
38 | 38 |
fi |
39 | 39 |
#pip_install_gr <there-si-no-guestfs-in-pypi> |
40 | 40 |
elif is_fedora || is_suse; then |
41 |
- install_package kvm |
|
41 |
+ # On "KVM for IBM z Systems", kvm does not have its own package |
|
42 |
+ if [[ ! ${DISTRO} =~ "kvmibm1" ]]; then |
|
43 |
+ install_package kvm |
|
44 |
+ fi |
|
42 | 45 |
# there is a dependency issue with kvm (which is really just a |
43 | 46 |
# wrapper to qemu-system-x86) that leaves some bios files out, |
44 | 47 |
# so install qemu-kvm (which shouldn't strictly be needed, as |
... | ... |
@@ -183,7 +183,7 @@ source $TOP_DIR/stackrc |
183 | 183 |
|
184 | 184 |
# Warn users who aren't on an explicitly supported distro, but allow them to |
185 | 185 |
# override check and attempt installation with ``FORCE=yes ./stack`` |
186 |
-if [[ ! ${DISTRO} =~ (trusty|vivid|wily|7.0|wheezy|sid|testing|jessie|f22|f23|rhel7) ]]; then |
|
186 |
+if [[ ! ${DISTRO} =~ (trusty|vivid|wily|7.0|wheezy|sid|testing|jessie|f22|f23|rhel7|kvmibm1) ]]; then |
|
187 | 187 |
echo "WARNING: this script has not been tested on $DISTRO" |
188 | 188 |
if [[ "$FORCE" != "yes" ]]; then |
189 | 189 |
die $LINENO "If you wish to run this script anyway run with FORCE=yes" |