chiark / gitweb /
set event timeout to 60 sec and settle timeout to 120
authorKay Sievers <kay.sievers@vrfy.org>
Wed, 27 Apr 2011 22:04:17 +0000 (00:04 +0200)
committerKay Sievers <kay.sievers@vrfy.org>
Wed, 27 Apr 2011 22:04:17 +0000 (00:04 +0200)
init/udev-settle.service.in
udev/udev-event.c
udev/udevadm-settle.c
udev/udevadm.xml

index bda8626..d7d6f78 100644 (file)
@@ -17,6 +17,7 @@ Before=basic.target
 
 [Service]
 Type=oneshot
+TimeoutSec=180
 RemainAfterExit=yes
 ExecStart=@sbindir@/udevadm settle
 
index e5683cf..8b7362c 100644 (file)
@@ -49,7 +49,7 @@ struct udev_event *udev_event_new(struct udev_device *dev)
        udev_list_init(&event->run_list);
        event->fd_signal = -1;
        event->birth_usec = now_usec();
-       event->timeout_usec = 120 * 1000 * 1000;
+       event->timeout_usec = 60 * 1000 * 1000;
        dbg(event->udev, "allocated event %p\n", event);
        return event;
 }
index afd4af5..9492abd 100644 (file)
@@ -52,7 +52,7 @@ int udevadm_settle(struct udev *udev, int argc, char *argv[])
        unsigned long long end = 0;
        int quiet = 0;
        const char *exists = NULL;
-       unsigned int timeout = 180;
+       unsigned int timeout = 120;
        struct pollfd pfd[1];
        struct udev_queue *udev_queue = NULL;
        int rc = EXIT_FAILURE;
index 7860efe..b5fb971 100644 (file)
           <term><option>--timeout=<replaceable>seconds</replaceable></option></term>
           <listitem>
             <para>Maximum number of seconds to wait for the event queue to become empty.
-            The default value is 180 seconds. A value of 0 will check if the queue is empty
+            The default value is 120 seconds. A value of 0 will check if the queue is empty
             and always return immediately.</para>
           </listitem>
         </varlistentry>