6a62c05e32
- Add upstream patches as real fixes 0001-activate-fix-fd-leak-in-do_accept.patch 0002-analyze-avoid-a-null-dereference.patch 0003-analyze-fix-mem-leak.patch 0004-backlight-Avoid-error-when-state-restore-is-disabled.patch 0005-bus-avoid-using-m-kdbus-after-freeing-it.patch 0006-bus-unref-buscreds-on-failure.patch 0007-core-fix-a-potential-mem-leak.patch 0008-core-smack-setup-Actually-allow-for-succesfully-load.patch 0009-journal-do-not-leak-mmaps-on-OOM.patch 0010-manager-use-correct-cleanup-function.patch - Intergrate the work of Robert and rename the patch 1068-udev-remove-userspace-firmware-loading-support.patch to 1078-udev-remove-userspace-firmware-loading-support.patch Also add patch 1079-udev-remove-userspace-firmware-loading-support.patch to apply the same change for opensuse 13.2 and above - Add upstream patch 0001-systemctl-allow-to-change-the-default-target-without.patch to allow to override default target without --force (bnc#896664) - Add upstream patches for udev 1068-udev-net_setup_link-export-the-.link-filename-applie.patch 1069-rules-net-setup-link-preserve-ID_NET_LINK_FILE-and-I.patch 1070-rules-net-setup-link-remove-stray-linebreak.patch 1071-udev-import-the-full-db-on-MOVE-events-for-devices-w.patch 1072-udev-netif_rename-don-t-log-to-kmsg.patch 1073-udev-drop-print_kmsg.patch 1074-udev-fix-copy-paste-error-in-log-message.patch OBS-URL: https://build.opensuse.org/request/show/249581 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemd?expand=0&rev=206
29 lines
971 B
Diff
29 lines
971 B
Diff
From b5338a19864ac3f5632aee48069a669479621dca Mon Sep 17 00:00:00 2001
|
|
From: Tom Gundersen <teg@jklm.no>
|
|
Date: Wed, 10 Sep 2014 10:56:26 +0200
|
|
Subject: [PATCH] udev: timeout - increase timeout
|
|
|
|
Some kernel modules still take more than one minute to insmod, we no longer rely on the timeout
|
|
killing insmod within a given period of time, so just bump this to a much higher value. Its only
|
|
purpose is to make sure that nothing stays aronud forever.
|
|
---
|
|
src/udev/udevd.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git src/udev/udevd.c src/udev/udevd.c
|
|
index b023b6e..a7f8cbd 100644
|
|
--- src/udev/udevd.c
|
|
+++ src/udev/udevd.c
|
|
@@ -74,7 +74,7 @@ static bool reload;
|
|
static int children;
|
|
static int children_max;
|
|
static int exec_delay;
|
|
-static usec_t event_timeout_usec = 60 * USEC_PER_SEC;
|
|
+static usec_t event_timeout_usec = 180 * USEC_PER_SEC;
|
|
static sigset_t sigmask_orig;
|
|
static UDEV_LIST(event_list);
|
|
static UDEV_LIST(worker_list);
|
|
--
|
|
1.7.9.2
|
|
|