diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-11-05 00:54:28 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-11-05 00:54:28 +0100 |
| commit | b22a66ddb26d6c37c6904ac7647206f8dfa271d9 (patch) | |
| tree | a820930d8d096deb6cae303562a98995a085a54d | |
| parent | 64a7cc062ad132ff02c830f4696710e0c7003741 (diff) | |
| download | jenkins.debian.net-b22a66ddb26d6c37c6904ac7647206f8dfa271d9.tar.xz | |
g-i-i: let guest shutdown qemu
| -rw-r--r-- | 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 2b14d03b..af8caa5d 100644 --- a/bin/g-i-installation.sh +++ b/bin/g-i-installation.sh @@ -174,7 +174,7 @@ bootstrap_system() { sudo qemu-img create -f raw $LV ${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 -cpu host" + QEMU_OPTS="-display vnc=$DISPLAY -enable-kvm -cpu host" if [ -n "$IMAGE" ] ; then QEMU_OPTS="$QEMU_OPTS -cdrom $IMAGE -boot d" case $NAME in @@ -282,7 +282,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 -cpu host" + QEMU_OPTS="-display vnc=$DISPLAY -enable-kvm -cpu host" echo "Checking $LV:" FILE=$(sudo file -Ls $LV) if [ $(echo $FILE | grep -E '(x86 boot sector|DOS/MBR boot sector)' | wc -l) -eq 0 ] ; then |