set event timeout to 60 sec and settle timeout to 120

diff --git a/init/udev-settle.service.in b/init/udev-settle.service.in
index bda8626b2d7e37c714a570b2f989818ac709742c..d7d6f782cb95d01b3314830cd8689684c439a90d 100644 (file)
--- a/init/udev-settle.service.in
+++ b/init/udev-settle.service.in
@@ -17,6 +17,7 @@ Before=basic.target
 
 [Service]
 Type=oneshot
+TimeoutSec=180
 RemainAfterExit=yes
 ExecStart=@sbindir@/udevadm settle
 

diff --git a/udev/udev-event.c b/udev/udev-event.c
index e5683cfc2a4ba91262fecdf495807c0fe8dc462e..8b7362cc10e830acf0ba1533faa69f7d5372a710 100644 (file)
--- a/udev/udev-event.c
+++ b/udev/udev-event.c
@@ -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;
 }

diff --git a/udev/udevadm-settle.c b/udev/udevadm-settle.c
index afd4af5f4b06617676f3bc8f4b8aed9d19ffb2de..9492abd401e0dbb8f9efd193ac383d045139ac29 100644 (file)
--- a/udev/udevadm-settle.c
+++ b/udev/udevadm-settle.c
@@ -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;

diff --git a/udev/udevadm.xml b/udev/udevadm.xml
index 7860efe9672558a54fa33b90901ac0b182f560fb..b5fb971f3bdb9dea2b6873df73b87798041c9f22 100644 (file)
--- a/udev/udevadm.xml
+++ b/udev/udevadm.xml
@@ -262,7 +262,7 @@
           <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>