From 411139148df295dd9d620d9fc4f073d1af2c862d Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 19 Jun 2010 21:57:20 +0000
Subject: [PATCH] * Put a timeout on the call to readline.

svn path=/nixos/branches/boot-order/; revision=22338
---
 lib/test-driver/Machine.pm | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/test-driver/Machine.pm b/lib/test-driver/Machine.pm
index c18e0e331628..46fbf6d60cdf 100644
--- a/lib/test-driver/Machine.pm
+++ b/lib/test-driver/Machine.pm
@@ -209,9 +209,12 @@ sub connect {
 
     $self->start;
 
-    my $line = readline $self->{socket} or die;
+    local $SIG{ALRM} = sub { die "timed out waiting for the guest to connect\n"; };
+    alarm 300;
+    readline $self->{socket} or die;
+    alarm 0;
+        
     $self->log("connected to guest root shell");
-    
     $self->{connected} = 1;
 }