Allow connecting to screen.

(This used to be commit a021408c9d78260b9abf7ebec4230b7958033a38)

diff --git a/source4/selftest/config.mk b/source4/selftest/config.mk
index 306a11469c4bd5e4a51c7278c38926d30828f692..4e9d31b684ecec553ced4f700c200a519999c09a 100644 (file)
--- a/source4/selftest/config.mk
+++ b/source4/selftest/config.mk
@@ -11,10 +11,10 @@ test:: everything
        $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate $(TESTS)
 
 kvmtest:: everything
-       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --target=kvm --image=$(KVM_IMAGE)
+       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate --target=kvm --image=$(KVM_IMAGE)
 
 kvmquicktest:: everything
-       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --quick --target=kvm --image=$(KVM_IMAGE)
+       $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --immediate --quick --target=kvm --image=$(KVM_IMAGE)
 
 testone:: everything
        $(SELFTEST) $(DEFAULT_TEST_OPTIONS) --one $(TESTS)

diff --git a/source4/selftest/target/Kvm.pm b/source4/selftest/target/Kvm.pm
index 1037f23c595e625ca260bc9986bc51b90ec36b3d..7799cb7ec045133160e6011c41fbd4be57163ad3 100644 (file)
--- a/source4/selftest/target/Kvm.pm
+++ b/source4/selftest/target/Kvm.pm
@@ -99,7 +99,7 @@ sub start($$$)
 
        my $pidfile = "$path/kvm.pid";
 
-       my $opts = ($ENV{KVM_OPTIONS} or "-nographic");
+       my $opts = (defined($ENV{KVM_OPTIONS})?$ENV{KVM_OPTIONS}:"-nographic");
 
        my ($ifup_script, $dhcpd_pidfile, $ip_address) = $self->write_kvm_ifup($path, "192.168.9");