summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2013-09-02 22:20:42 +0200
committerHolger Levsen <holger@layer-acht.org>2013-09-02 22:20:42 +0200
commit067be61fbda48e68c672fd1afe90877b3a70afdd (patch)
tree498776eb90d931d8be1c9fb34d37cfd5fb87201d
parent2e9cd3167dc3e31010e45945102e038af50bcefb (diff)
downloadjenkins.debian.net-067be61fbda48e68c672fd1afe90877b3a70afdd.tar.xz
Revert "Revert "enable KVM, should work now""
This reverts commit 2e9cd3167dc3e31010e45945102e038af50bcefb.
-rwxr-xr-xbin/g-i-installation.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh
index 9ff67026..d8f7ada9 100755
--- a/bin/g-i-installation.sh
+++ b/bin/g-i-installation.sh
@@ -127,7 +127,7 @@ bootstrap_system() {
qemu-img create -f raw $NAME.raw ${DISKSIZE_IN_GB}G
echo "Doing g-i installation test for $NAME now."
# qemu related variables (incl kernel+initrd) - display first, as we grep for this in the process list
- QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown"
+ QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown -enable-kvm"
if [ -n "$IMAGE" ] ; then
QEMU_OPTS="$QEMU_OPTS -cdrom $IMAGE -boot d"
case $NAME in
@@ -227,7 +227,7 @@ boot_system() {
cd $WORKSPACE
echo "Booting system installed with g-i installation test for $NAME."
# qemu related variables (incl kernel+initrd) - display first, as we grep for this in the process list
- QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown"
+ QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown -enable-kvm"
QEMU_OPTS="$QEMU_OPTS -drive file=$NAME.raw,index=0,media=disk,cache=writeback -m $RAMSIZE -net nic,vlan=0 -net user,vlan=0,host=10.0.2.1,dhcpstart=10.0.2.2,dns=10.0.2.254"
echo "Checking $NAME.raw:"
FILE=$(file $NAME.raw)