hal: Branch 'master'

[Martin Pitt]

 hald/hald_runner.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 15604d786c6f88f1b80632b885e1029b32b9176b
Author: Martin Pitt <martin.pitt at ubuntu.com>
Date:   Mon Nov 10 13:01:48 2008 +0100

    increase hal helper timeout to fix slow CD-ROMs
    
    in https://launchpad.net/bugs/218834 we got a report that some CD-ROMs
    are too slow to properly detect everything within the standard 10
    seconds hal helper timeout:
    
    [6188]: 22:22:56.009 [D] probe-volume.c:379: Doing probe-volume for
    /dev/scd0
    [...]
    [6182]: 22:22:58.002 [I] addon-storage.c:363: ... device /dev/scd0 is
    not locked on HAL
    [6188]: 22:23:05.558 [D] probe-volume.c:542: volume.disc.capacity =
    2384855040
    [...]
    [6188]: 22:23:06.406 [E] probe-volume.c:302: Timed out probing
    /dev/scd0 - broken device driver?
    
    (NB the timestamps). Since the default 10 seconds seems to be pretty
    much arbitrary, I just raised it to 20 for now.
    
    Fixes bz #13009.

diff --git a/hald/hald_runner.h b/hald/hald_runner.h
index 6580993..fda9e50 100644
--- a/hald/hald_runner.h
+++ b/hald/hald_runner.h
@@ -40,7 +40,7 @@
 #define HALD_RUN_KILLED 0x4
 
 /* Default sane timeout */
-#define HAL_HELPER_TIMEOUT 10000
+#define HAL_HELPER_TIMEOUT 20000
 
 typedef void (*HalRunTerminatedCB) (HalDevice *d, guint32 exit_type, 
                                        gint return_code, gchar **error,