udev: firmware - do not cancel requests in the initrd

2012-07-19 12:33:30 +02:00
parent c2f1db8f83
commit 39177382a4
1 changed files with 7 additions and 1 deletions
@@ -129,7 +129,13 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo
                                err = -errno;
                } while (err == -ENOENT);
                rc = EXIT_FAILURE;
-                set_loading(udev, loadpath, "-1");
+                /*
+                 * Do not cancel the request in the initrd, the real root might have
+                 * the firmware file and the 'coldplug' run in the real root will find
+                 * this pending request and fulfill or cancel it.
+                 * */
+                if (!in_initrd())
+                        set_loading(udev, loadpath, "-1");
                goto exit;
        }