From 44f870be42fc687f0e48a822a2cad109962d93a6 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Tue, 26 Mar 2013 16:17:24 +0100 Subject: [PATCH] test: change qemu param -nographic to -display none for -daemonize qemu does not like -nographic in combination with -daemonize --- test/TEST-20-NFS/test.sh | 2 +- test/TEST-30-ISCSI/test.sh | 3 ++- test/TEST-40-NBD/test.sh | 3 ++- test/TEST-50-MULTINIC/test.sh | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/test/TEST-20-NFS/test.sh b/test/TEST-20-NFS/test.sh index daf5bac0c..2b8a2ec92 100755 --- a/test/TEST-20-NFS/test.sh +++ b/test/TEST-20-NFS/test.sh @@ -18,7 +18,7 @@ run_server() { $testdir/run-qemu \ -hda $TESTDIR/server.ext3 \ -m 256M -smp 2 \ - -nographic \ + -display none \ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ -net socket,listen=127.0.0.1:12320 \ -serial $SERIAL \ diff --git a/test/TEST-30-ISCSI/test.sh b/test/TEST-30-ISCSI/test.sh index f6893a86e..f9502e0d0 100755 --- a/test/TEST-30-ISCSI/test.sh +++ b/test/TEST-30-ISCSI/test.sh @@ -16,7 +16,8 @@ run_server() { -hdb $TESTDIR/root.ext3 \ -hdc $TESTDIR/iscsidisk2.img \ -hdd $TESTDIR/iscsidisk3.img \ - -m 256M -smp 2 -nographic \ + -m 256M -smp 2 \ + -display none \ -serial $SERIAL \ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ -net socket,listen=127.0.0.1:12330 \ diff --git a/test/TEST-40-NBD/test.sh b/test/TEST-40-NBD/test.sh index 4feb557f1..88570aff4 100755 --- a/test/TEST-40-NBD/test.sh +++ b/test/TEST-40-NBD/test.sh @@ -18,7 +18,8 @@ run_server() { -hda $TESTDIR/server.ext2 \ -hdb $TESTDIR/nbd.ext2 \ -hdc $TESTDIR/encrypted.ext2 \ - -m 256M -smp 2 -nographic \ + -m 256M -smp 2 \ + -display none \ -net nic,macaddr=52:54:00:12:34:56,model=e1000 \ -net socket,listen=127.0.0.1:12340 \ -serial $SERIAL \ diff --git a/test/TEST-50-MULTINIC/test.sh b/test/TEST-50-MULTINIC/test.sh index 17c8cc52b..a3aa6792a 100755 --- a/test/TEST-50-MULTINIC/test.sh +++ b/test/TEST-50-MULTINIC/test.sh @@ -18,7 +18,7 @@ run_server() { $testdir/run-qemu \ -hda $TESTDIR/server.ext3 \ -m 512M -smp 2 \ - -nographic \ + -display none \ -netdev socket,mcast=230.0.0.1:12320,id=net0 \ -net nic,macaddr=52:54:01:12:34:56,model=e1000,netdev=net0 \ -serial $SERIAL \ -- 2.47.3