From: Kay Sievers <kay.sievers@vrfy.org>
Date: Wed, 27 Apr 2011 22:04:17 +0000 (+0200)
Subject: set event timeout to 60 sec and settle timeout to 120
X-Git-Tag: 174~157
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2f4a3464dacf56f50c3ab4fa42353efd33ce22b;p=systemd

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 bda8626b..d7d6f782 100644
--- 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 e5683cfc..8b7362cc 100644
--- 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 afd4af5f..9492abd4 100644
--- 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 7860efe9..b5fb971f 100644
--- 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>