chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
STRV_FOREACH_BACWARDS: start at the tail of the list
[elogind.git]
/
src
/
udev
/
udev-builtin-firmware.c
diff --git
a/src/udev/udev-builtin-firmware.c
b/src/udev/udev-builtin-firmware.c
index 9cb42946332e96f74dc3dd263243d1d80b73ed71..b80940b6efde9bed416f26d1135e952e94c0ccd8 100644
(file)
--- 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 };
{
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];
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;
}
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) {
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);
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
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;
}
goto exit;
}
- if (unlink(misspath) == 0)
- util_delete_path(udev, misspath);
-
if (!set_loading(udev, loadpath, "1"))
goto exit;
if (!set_loading(udev, loadpath, "1"))
goto exit;