josch/devstack_custom
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

add back NOPRIME, and explicitly install libvirt-bin

Browse source
This commit is contained in:
Anthony Young 2011-11-16 00:43:34 -06:00
parent 9f3ebced86
commit a6353c62d5
1 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
stack.sh
View file

@ -376,6 +376,8 @@ fi
# - We are going to install packages only for the services needed. # - We are going to install packages only for the services needed.
# - We are parsing the packages files and detecting metadatas. # - We are parsing the packages files and detecting metadatas.
# - If there is a NOPRIME as comment mean we are not doing the install
# just yet.
# - If we have the meta-keyword distro:DISTRO or # - If we have the meta-keyword distro:DISTRO or
# distro:DISTRO1,DISTRO2 it will be installed only for those # distro:DISTRO1,DISTRO2 it will be installed only for those
# distros (case insensitive). # distros (case insensitive).
@ -409,6 +411,10 @@ function get_packages() {
OIFS=$IFS OIFS=$IFS
IFS=$'\n' IFS=$'\n'
for line in $(<${fname}); do for line in $(<${fname}); do
if [[ $line =~ "NOPRIME" ]]; then
continue
fi
if [[ $line =~ (.*)#.*dist:([^ ]*) ]]; then # We are using BASH regexp matching feature. if [[ $line =~ (.*)#.*dist:([^ ]*) ]]; then # We are using BASH regexp matching feature.
package=${BASH_REMATCH[1]} package=${BASH_REMATCH[1]}
distros=${BASH_REMATCH[2]} distros=${BASH_REMATCH[2]}
@ -671,6 +677,7 @@ if [[ "$ENABLED_SERVICES" =~ "n-cpu" ]]; then
# kvm, we drop back to the slower emulation mode (qemu). Note: many systems # kvm, we drop back to the slower emulation mode (qemu). Note: many systems
# come with hardware virtualization disabled in BIOS. # come with hardware virtualization disabled in BIOS.
if [[ "$LIBVIRT_TYPE" == "kvm" ]]; then if [[ "$LIBVIRT_TYPE" == "kvm" ]]; then
apt_get install libvirt-bin
sudo modprobe kvm || true sudo modprobe kvm || true
if [ ! -e /dev/kvm ]; then if [ ! -e /dev/kvm ]; then
echo "WARNING: Switching to QEMU" echo "WARNING: Switching to QEMU"