1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-21 02:50:18 +03:00

[PATCH] make the searched multiplex directories conditionally

If we don't have "name" or a "subsystem" don't look for it.
This commit is contained in:
kay.sievers@vrfy.org 2004-11-23 06:22:26 +01:00 committed by Greg KH
parent 6f59ed5547
commit 491b02acd9

16
dev_d.c
View File

@ -96,13 +96,17 @@ void dev_d_execute(struct udevice *udev, const char *basedir, const char *suffix
temp = strchr(temp, '/');
}
snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->name);
dirname[PATH_MAX-1] = '\0';
call_foreach_file(run_program, dirname, suffix, udev);
if (udev->name[0] != '\0') {
snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->name);
dirname[PATH_MAX-1] = '\0';
call_foreach_file(run_program, dirname, suffix, udev);
}
snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->subsystem);
dirname[PATH_MAX-1] = '\0';
call_foreach_file(run_program, dirname, suffix, udev);
if (udev->subsystem[0] != '\0') {
snprintf(dirname, PATH_MAX, "%s/%s", basedir, udev->subsystem);
dirname[PATH_MAX-1] = '\0';
call_foreach_file(run_program, dirname, suffix, udev);
}
snprintf(dirname, PATH_MAX, "%s/default", basedir);
dirname[PATH_MAX-1] = '\0';