From 33f63de66bb16c4ca96255a17975268a7d958281 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 19 Feb 2008 04:44:30 +0100
Subject: kvm fixes. (This used to be commit
 3a5e2f9ba3131a2a264e21640db8bea255fe9ea3)

---
 source4/selftest/selftest.pl   | 1 +
 source4/selftest/target/Kvm.pm | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

(limited to 'source4')

diff --git a/source4/selftest/selftest.pl b/source4/selftest/selftest.pl
index b6ce643eb3..8647dee9d2 100755
--- a/source4/selftest/selftest.pl
+++ b/source4/selftest/selftest.pl
@@ -144,6 +144,7 @@ my $opt_expected_failures = undef;
 my @opt_exclude = ();
 my @opt_include = ();
 my $opt_verbose = 0;
+my $opt_image = undef;
 my $opt_testenv = 0;
 my $ldap = undef;
 my $opt_analyse_cmd = undef;
diff --git a/source4/selftest/target/Kvm.pm b/source4/selftest/target/Kvm.pm
index efd4fa2f7a..74b726d183 100644
--- a/source4/selftest/target/Kvm.pm
+++ b/source4/selftest/target/Kvm.pm
@@ -46,7 +46,9 @@ sub start($)
 
 	my $pidfile = "kvm.pid";
 
-	system("kvm $ENV{KVM_OPTIONS} -daemonize -pidfile $pidfile -net user -vnc unix:kvm.vnc -snapshot $self->{image}");
+	my $opts = ($ENV{KVM_OPTIONS} or "");
+
+	system("kvm $opts -daemonize -pidfile $pidfile -vnc unix:kvm.vnc -snapshot $self->{image}");
 
 	open(PID, $pidfile);
 	$self->{pid} = <PID>;
-- 
cgit