diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-03-03 18:20:09 +0100 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-03-03 18:31:52 +0100 |
| commit | 3f60bcb5e69846fe8a3156ca1c9a7e0813ac158a (patch) | |
| tree | 28e2e686a7187e525be41dc2c4137126fa08c8ba /src/udev | |
| parent | d288f79fb4a2fe4a93cf99f74dacd2cebd3f2440 (diff) | |
udev: firmware - do not created /run/udev/firmware-missing/
The userspace firmware loader is deprecated now, and will be entirely
removed when we depend on a kernel version with the built-in firmware
loader available.
Diffstat (limited to 'src/udev')
| -rw-r--r-- | src/udev/udev-builtin-firmware.c | 18 | ||||
| -rw-r--r-- | src/udev/udevadm-info.c | 6 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c index 9cb4294633..b80940b6ef 100644 --- a/src/udev/udev-builtin-firmware.c +++ b/src/udev/udev-builtin-firmware.c @@ -78,8 +78,6 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo { struct udev *udev = udev_device_get_udev(dev); static const char *searchpath[] = { FIRMWARE_PATH }; - char fwencpath[UTIL_PATH_SIZE]; - char misspath[UTIL_PATH_SIZE]; char loadpath[UTIL_PATH_SIZE]; char datapath[UTIL_PATH_SIZE]; char fwpath[UTIL_PATH_SIZE]; @@ -111,23 +109,10 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo break; } - util_path_encode(firmware, fwencpath, sizeof(fwencpath)); - strscpyl(misspath, sizeof(misspath), "/run/udev/firmware-missing/", fwencpath, NULL); strscpyl(loadpath, sizeof(loadpath), udev_device_get_syspath(dev), "/loading", NULL); if (fwfile == NULL) { - int err; - - /* This link indicates the missing firmware file and the associated device */ log_debug("did not find firmware file '%s'\n", firmware); - do { - err = mkdir_parents(misspath, 0755); - if (err != 0 && err != -ENOENT) - break; - err = symlink(udev_device_get_devpath(dev), misspath); - if (err != 0) - err = -errno; - } while (err == -ENOENT); rc = EXIT_FAILURE; /* * Do not cancel the request in the initrd, the real root might have @@ -146,9 +131,6 @@ static int builtin_firmware(struct udev_device *dev, int argc, char *argv[], boo goto exit; } - if (unlink(misspath) == 0) - util_delete_path(udev, misspath); - if (!set_loading(udev, loadpath, "1")) goto exit; diff --git a/src/udev/udevadm-info.c b/src/udev/udevadm-info.c index 0f4565eda8..c47821401a 100644 --- a/src/udev/udevadm-info.c +++ b/src/udev/udevadm-info.c @@ -256,12 +256,6 @@ static void cleanup_db(struct udev *udev) cleanup_dir(dir, 0, 1); closedir(dir); } - - dir = opendir("/run/udev/firmware-missing"); - if (dir != NULL) { - cleanup_dir(dir, 0, 1); - closedir(dir); - } } static struct udev_device *find_device(struct udev *udev, const char *id, const char *prefix) |