Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Matthias Schwarzott (zzam)" <zzam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/udev/files: udev-150-fix-missing-firmware-timeout.diff
Date: Mon, 01 Feb 2010 20:54:04
Message-Id: E1Nc3HV-0006KE-0l@stork.gentoo.org
1 zzam 10/02/01 20:54:01
2
3 Added: udev-150-fix-missing-firmware-timeout.diff
4 Log:
5 Fix missing firmware timeout, to stop modprobe from waiting 60s for no file stretching boot very long, Bug #301667.
6 (Portage version: 2.1.7.17/cvs/Linux x86_64)
7
8 Revision Changes Path
9 1.1 sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff
10
11 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff?rev=1.1&view=markup
12 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff?rev=1.1&content-type=text/plain
13
14 Index: udev-150-fix-missing-firmware-timeout.diff
15 ===================================================================
16 diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c
17 index 8f70be4..16455de 100644
18 --- a/extras/firmware/firmware.c
19 +++ b/extras/firmware/firmware.c
20 @@ -149,6 +149,7 @@ int main(int argc, char **argv)
21
22 util_path_encode(firmware, fwencpath, sizeof(fwencpath));
23 util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL);
24 + util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
25
26 if (fwfile == NULL) {
27 int err;
28 @@ -166,6 +167,7 @@ int main(int argc, char **argv)
29 udev_selinux_resetfscreatecon(udev);
30 } while (err == -ENOENT);
31 rc = 2;
32 + set_loading(udev, loadpath, "-1");
33 goto exit;
34 }
35
36 @@ -176,7 +178,6 @@ int main(int argc, char **argv)
37 if (unlink(misspath) == 0)
38 util_delete_path(udev, misspath);
39
40 - util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL);
41 set_loading(udev, loadpath, "1");
42
43 util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL);
Report Message
Find on MARC Find on Google Groups