diff options
| author | Holger Levsen <holger@layer-acht.org> | 2013-09-02 22:12:21 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2013-09-02 22:12:21 +0200 |
| commit | 2e9cd3167dc3e31010e45945102e038af50bcefb (patch) | |
| tree | cf31833ced6934d256b214e3df5c04e797722edd /bin | |
| parent | 2fce0b76f1d1441f88b30e08b1ce7b09fa01c51e (diff) | |
| download | jenkins.debian.net-2e9cd3167dc3e31010e45945102e038af50bcefb.tar.xz | |
Revert "enable KVM, should work now"
This reverts commit 90454529da6ffe0f80a8c9cd9ae346aa445090ec.
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/g-i-installation.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/g-i-installation.sh b/bin/g-i-installation.sh index d8f7ada9..9ff67026 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 -enable-kvm" + QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown" 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 -enable-kvm" + QEMU_OPTS="-display vnc=$DISPLAY -no-shutdown" 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) |