hal: Branch 'master'

[David Zeuthen]

 hald/mmap_cache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree d0dfd958d45c81ab57713d07e42634e1c5110ccb (from 0739ba39c3d6fea8efe1725b160e18ff826ec267)
Author: David Zeuthen <davidz at redhat.com>
Date:   Tue Sep 25 11:49:12 2007 -0400

    bump fdi generation timeout to 60s
    
    Normally this only takes a few hundred ms, however fcrozat reports
    that it takes 22 seconds to generate the fdi chace when he uses non-VT
    capable virtual hosts.

diff --git a/hald/mmap_cache.c b/hald/mmap_cache.c
index af875d9..be31429 100644
--- a/hald/mmap_cache.c
+++ b/hald/mmap_cache.c
@@ -145,7 +145,7 @@ regen_cache (void)
 	hald_runner_run_sync (NULL, 
 			      "hald-generate-fdi-cache --force",
 			      extra_env,
-			      10000,
+			      60000,
 			      regen_cache_cb,
 			      NULL,
 			      NULL);