diff options
| author | Anthony G. Basile <blueness@gentoo.org> | 2013-03-31 22:00:59 -0400 |
|---|---|---|
| committer | Ian Stakenvicius <axs@gentoo.org> | 2013-04-02 15:02:48 -0400 |
| commit | 601c4e8ce69338652b3c9178386cbc05de8bae8d (patch) | |
| tree | 8c76835f8bc34a1dd81e1f48ec38c02b32e3e766 /src/udev/udev-builtin-firmware.c | |
| parent | 20d47ae5b565723c596b5c8afbfd6f7583a9f49e (diff) | |
udev: update
This updates the daemon codebase to upstream.
Authors:
Zbigniew Jędrzejewski-Szmek
Lennart Poettering
Václav Pavlín
Kay Sievers
Harald Hoyer
Rob Clark
Zeeshan Ali (Khattak)
See http://cgit.freedesktop.org/systemd/systemd/log/src/udev
Ian is signing off but has some concerns on a few of the changes
that he may fix in future commits.
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Signed-off-by: Ian Stakenvicius <axs@gentoo.org>
Diffstat (limited to 'src/udev/udev-builtin-firmware.c')
| -rw-r--r-- | src/udev/udev-builtin-firmware.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/src/udev/udev-builtin-firmware.c b/src/udev/udev-builtin-firmware.c index 4a91d33575..a23b8c1a46 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)); - util_strscpyl(misspath, sizeof(misspath), "/run/udev/firmware-missing/", fwencpath, NULL); util_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; |