diff options
| author |   Matthias Schwarzott <zzam@gentoo.org> | 2010-02-01 20:54:00 +0000 |
|---|---|---|
| committer | Matthias Schwarzott <zzam@gentoo.org> | 2010-02-01 20:54:00 +0000 |
| commit | 0e09da68b194a25ae7cd59e4c070ebdc7de85c75 (patch) | |
| tree | 6e9e28f57d8ef3307c5fb1a4073391778dbb96f5 /sys-fs/udev/files | |
| parent | We don't install the splash window until we have a gentoo community (diff) | |
| download | historical-0e09da68b194a25ae7cd59e4c070ebdc7de85c75.tar.gz historical-0e09da68b194a25ae7cd59e4c070ebdc7de85c75.tar.bz2 historical-0e09da68b194a25ae7cd59e4c070ebdc7de85c75.zip | |
Fix missing firmware timeout, to stop modprobe from waiting 60s for no file stretching boot very long, Bug #301667.
Package-Manager: portage-2.1.7.17/cvs/Linux x86_64
Diffstat (limited to 'sys-fs/udev/files')
| -rw-r--r-- | sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff b/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff new file mode 100644 index 000000000000..7690f6b39af9 --- /dev/null +++ b/sys-fs/udev/files/udev-150-fix-missing-firmware-timeout.diff @@ -0,0 +1,29 @@ +diff --git a/extras/firmware/firmware.c b/extras/firmware/firmware.c +index 8f70be4..16455de 100644 +--- a/extras/firmware/firmware.c ++++ b/extras/firmware/firmware.c +@@ -149,6 +149,7 @@ int main(int argc, char **argv) + + util_path_encode(firmware, fwencpath, sizeof(fwencpath)); + util_strscpyl(misspath, sizeof(misspath), udev_get_dev_path(udev), "/.udev/firmware-missing/", fwencpath, NULL); ++ util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); + + if (fwfile == NULL) { + int err; +@@ -166,6 +167,7 @@ int main(int argc, char **argv) + udev_selinux_resetfscreatecon(udev); + } while (err == -ENOENT); + rc = 2; ++ set_loading(udev, loadpath, "-1"); + goto exit; + } + +@@ -176,7 +178,6 @@ int main(int argc, char **argv) + if (unlink(misspath) == 0) + util_delete_path(udev, misspath); + +- util_strscpyl(loadpath, sizeof(loadpath), udev_get_sys_path(udev), devpath, "/loading", NULL); + set_loading(udev, loadpath, "1"); + + util_strscpyl(datapath, sizeof(datapath), udev_get_sys_path(udev), devpath, "/data", NULL); + |