set event timeout to 60 sec and settle timeout to 120

This commit is contained in:
Kay Sievers 2011-04-28 00:04:17 +02:00
parent f2f3b88072
commit d2f4a3464d
4 changed files with 4 additions and 3 deletions

View File

@ -17,6 +17,7 @@ Before=basic.target
[Service]
Type=oneshot
TimeoutSec=180
RemainAfterExit=yes
ExecStart=@sbindir@/udevadm settle

View 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;
}

View 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;

View File

@ -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>