diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-19 04:44:30 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-19 04:44:30 +0100 |
| commit | 33f63de66bb16c4ca96255a17975268a7d958281 (patch) | |
| tree | e113e25eef182f3f71e8d75f407f8d95189d4410 /source4/selftest | |
| parent | a153e7081c92ca851b6f1284d15d00de632bff78 (diff) | |
| download | samba-33f63de66bb16c4ca96255a17975268a7d958281.tar.gz samba-33f63de66bb16c4ca96255a17975268a7d958281.tar.bz2 samba-33f63de66bb16c4ca96255a17975268a7d958281.zip | |
kvm fixes.
(This used to be commit 3a5e2f9ba3131a2a264e21640db8bea255fe9ea3)
Diffstat (limited to 'source4/selftest')
| -rwxr-xr-x | source4/selftest/selftest.pl | 1 | ||||
| -rw-r--r-- | source4/selftest/target/Kvm.pm | 4 |
2 files changed, 4 insertions, 1 deletions
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>; |