summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-10 12:02:48 +0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2015-06-10 15:28:55 +0200
commit0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92 (patch)
tree045c549c34e5892bc13e0c8d5a0cb3f805295d97
parent38b58bab62d60c3cd8a1cb0d3ccf3ade5d9cb2ee (diff)
downloadnixpkgs-0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92.tar
nixpkgs-0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92.tar.gz
nixpkgs-0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92.tar.bz2
nixpkgs-0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92.tar.lz
nixpkgs-0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92.tar.xz
nixpkgs-0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92.tar.zst
nixpkgs-0f35f9bb69daea0ba2a69a806d8f472cf9ab3b92.zip
Drop obsolete boot=on parameter
-rw-r--r--nixos/lib/test-driver/Machine.pm16
1 files changed, 8 insertions, 8 deletions
diff --git a/nixos/lib/test-driver/Machine.pm b/nixos/lib/test-driver/Machine.pm
index db2c1a68692..6df8ddb9e95 100644
--- a/nixos/lib/test-driver/Machine.pm
+++ b/nixos/lib/test-driver/Machine.pm
@@ -21,7 +21,7 @@ sub new {
     my ($class, $args) = @_;
 
     my $startCommand = $args->{startCommand};
-    
+
     my $name = $args->{name};
     if (!$name) {
         $startCommand =~ /run-(.*)-vm$/ if defined $startCommand;
@@ -34,7 +34,7 @@ sub new {
             "qemu-kvm -m 384 " .
             "-net nic,model=virtio \$QEMU_OPTS ";
         my $iface = $args->{hdaInterface} || "virtio";
-        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,boot=on,werror=report "
+        $startCommand .= "-drive file=" . Cwd::abs_path($args->{hda}) . ",if=$iface,werror=report "
             if defined $args->{hda};
         $startCommand .= "-cdrom $args->{cdrom} "
             if defined $args->{cdrom};
@@ -171,7 +171,7 @@ sub start {
 
     eval {
         local $SIG{CHLD} = sub { die "QEMU died prematurely\n"; };
-        
+
         # Wait until QEMU connects to the monitor.
         accept($self->{monitor}, $monitorS) or die;
 
@@ -182,11 +182,11 @@ sub start {
         $self->{socket}->autoflush(1);
     };
     die "$@" if $@;
-    
+
     $self->waitForMonitorPrompt;
 
     $self->log("QEMU running (pid $pid)");
-    
+
     $self->{pid} = $pid;
     $self->{booted} = 1;
 }
@@ -241,7 +241,7 @@ sub connect {
         alarm 300;
         readline $self->{socket} or die "the VM quit before connecting\n";
         alarm 0;
-        
+
         $self->log("connected to guest root shell");
         $self->{connected} = 1;
 
@@ -270,7 +270,7 @@ sub isUp {
 
 sub execute_ {
     my ($self, $command) = @_;
-    
+
     $self->connect;
 
     print { $self->{socket} } ("( $command ); echo '|!=EOF' \$?\n");
@@ -453,7 +453,7 @@ sub shutdown {
 sub crash {
     my ($self) = @_;
     return unless $self->{booted};
-    
+
     $self->log("forced crash");
 
     $self->sendMonitorCommand("quit");