#include "udev.h"
#include "udevd.h"
+static int verbose;
+static int dry_run;
+LIST_HEAD(device_list);
+LIST_HEAD(filter_subsystem_match_list);
+LIST_HEAD(filter_subsystem_nomatch_list);
+LIST_HEAD(filter_attr_match_list);
+LIST_HEAD(filter_attr_nomatch_list);
+
#ifdef USE_LOG
void log_message(int priority, const char *format, ...)
{
}
#endif
-static int verbose;
-static int dry_run;
+/* devices that should run last cause of their dependencies */
+static int delay_device(const char *devpath)
+{
+ static const char *delay_device_list[] = {
+ "*/md*",
+ "*/dm-*",
+ NULL
+ };
+ int i;
-/* list of devices that we should run last due to any one of a number of reasons */
-static char *last_list[] = {
- "/class/block/md",
- "/class/block/dm-",
- "/block/md",
- "/block/dm-",
- NULL
-};
-
-/* list of devices that we should run first due to any one of a number of reasons */
-static char *first_list[] = {
- "/class/mem",
- "/class/tty",
- NULL
-};
-
-LIST_HEAD(device_first_list);
-LIST_HEAD(device_default_list);
-LIST_HEAD(device_last_list);
-
-LIST_HEAD(filter_subsytem_match_list);
-LIST_HEAD(filter_subsytem_nomatch_list);
-LIST_HEAD(filter_attr_match_list);
-LIST_HEAD(filter_attr_nomatch_list);
+ for (i = 0; delay_device_list[i] != NULL; i++)
+ if (fnmatch(delay_device_list[i], devpath, 0) == 0)
+ return 1;
+ return 0;
+}
static int device_list_insert(const char *path)
{
- struct list_head *device_list = &device_default_list;
- const char *devpath = &path[strlen(sysfs_path)];
- int i;
-
- for (i = 0; first_list[i] != NULL; i++) {
- if (strncmp(devpath, first_list[i], strlen(first_list[i])) == 0) {
- device_list = &device_first_list;
- break;
- }
- }
- for (i = 0; last_list[i] != NULL; i++) {
- if (strncmp(devpath, last_list[i], strlen(last_list[i])) == 0) {
- device_list = &device_last_list;
- break;
- }
- }
+ char filename[PATH_SIZE];
+ char devpath[PATH_SIZE];
+ struct stat statbuf;
dbg("add '%s'" , path);
- /* double entries will be ignored */
- name_list_add(device_list, path, 0);
+
+ /* we only have a device, if we have an uevent file */
+ strlcpy(filename, path, sizeof(filename));
+ strlcat(filename, "/uevent", sizeof(filename));
+ if (stat(filename, &statbuf) < 0)
+ return -1;
+ if (!(statbuf.st_mode & S_IWUSR))
+ return -1;
+
+ strlcpy(devpath, &path[strlen(sysfs_path)], sizeof(devpath));
+
+ /* resolve possible link to real target */
+ if (lstat(path, &statbuf) < 0)
+ return -1;
+ if (S_ISLNK(statbuf.st_mode))
+ if (sysfs_resolve_link(devpath, sizeof(devpath)) != 0)
+ return -1;
+
+ name_list_add(&device_list, devpath, 1);
return 0;
}
-static void trigger_uevent(const char *path)
+static void trigger_uevent(const char *devpath)
{
char filename[PATH_SIZE];
int fd;
- strlcpy(filename, path, sizeof(filename));
+ strlcpy(filename, sysfs_path, sizeof(filename));
+ strlcat(filename, devpath, sizeof(filename));
strlcat(filename, "/uevent", sizeof(filename));
if (verbose)
- printf("%s\n", path);
+ printf("%s\n", devpath);
if (dry_run)
return;
fd = open(filename, O_WRONLY);
if (fd < 0) {
- dbg("error on opening %s: %s\n", filename, strerror(errno));
+ dbg("error on opening %s: %s", filename, strerror(errno));
return;
}
if (write(fd, "add", 3) < 0)
- info("error on triggering %s: %s\n", filename, strerror(errno));
+ info("error on triggering %s: %s", filename, strerror(errno));
close(fd);
}
-static void exec_lists(void)
+static void exec_list(void)
{
struct name_entry *loop_device;
struct name_entry *tmp_device;
- /* handle the devices on the "first" list first */
- list_for_each_entry_safe(loop_device, tmp_device, &device_first_list, node) {
- trigger_uevent(loop_device->name);
- list_del(&loop_device->node);
- free(loop_device);
- }
+ list_for_each_entry_safe(loop_device, tmp_device, &device_list, node) {
+ if (delay_device(loop_device->name))
+ continue;
- /* handle the devices on the "default" list next */
- list_for_each_entry_safe(loop_device, tmp_device, &device_default_list, node) {
trigger_uevent(loop_device->name);
list_del(&loop_device->node);
free(loop_device);
}
- /* handle devices on the "last" list, if any */
- list_for_each_entry_safe(loop_device, tmp_device, &device_last_list, node) {
+ /* trigger remaining delayed devices */
+ list_for_each_entry_safe(loop_device, tmp_device, &device_list, node) {
trigger_uevent(loop_device->name);
list_del(&loop_device->node);
free(loop_device);
}
}
-static int is_device(const char *path)
-{
- char filename[PATH_SIZE];
- struct stat statbuf;
-
- /* look for the uevent file of the kobject */
- strlcpy(filename, path, sizeof(filename));
- strlcat(filename, "/uevent", sizeof(filename));
- if (stat(filename, &statbuf) < 0)
- return 0;
-
- if (!(statbuf.st_mode & S_IWUSR))
- return 0;
-
- return 1;
-}
-
static int subsystem_filtered(const char *subsystem)
{
struct name_entry *loop_name;
/* skip devices matching the listed subsystems */
- list_for_each_entry(loop_name, &filter_subsytem_nomatch_list, node)
+ list_for_each_entry(loop_name, &filter_subsystem_nomatch_list, node)
if (fnmatch(loop_name->name, subsystem, 0) == 0)
return 1;
/* skip devices not matching the listed subsystems */
- if (!list_empty(&filter_subsytem_match_list)) {
- list_for_each_entry(loop_name, &filter_subsytem_match_list, node)
+ if (!list_empty(&filter_subsystem_match_list)) {
+ list_for_each_entry(loop_name, &filter_subsystem_match_list, node)
if (fnmatch(loop_name->name, subsystem, 0) == 0)
return 0;
return 1;
return 0;
}
-static void scan_bus(void)
+static void scan_subsystem(const char *subsys)
{
char base[PATH_SIZE];
DIR *dir;
struct dirent *dent;
strlcpy(base, sysfs_path, sizeof(base));
- strlcat(base, "/bus", sizeof(base));
+ strlcat(base, "/", sizeof(base));
+ strlcat(base, subsys, sizeof(base));
dir = opendir(base);
if (dir != NULL) {
strlcat(dirname2, dent2->d_name, sizeof(dirname2));
if (attr_filtered(dirname2))
continue;
- if (is_device(dirname2))
- device_list_insert(dirname2);
+ device_list_insert(dirname2);
}
closedir(dir2);
}
char base[PATH_SIZE];
DIR *dir;
struct dirent *dent;
- struct stat statbuf;
-
- /* skip if "block" is already a "class" */
- strlcpy(base, sysfs_path, sizeof(base));
- strlcat(base, "/class/block", sizeof(base));
- if (stat(base, &statbuf) == 0)
- return;
if (subsystem_filtered("block"))
return;
strlcat(dirname, dent->d_name, sizeof(dirname));
if (attr_filtered(dirname))
continue;
- if (is_device(dirname))
- device_list_insert(dirname);
- else
+ if (device_list_insert(dirname) != 0)
continue;
/* look for partitions */
strlcat(dirname2, dent2->d_name, sizeof(dirname2));
if (attr_filtered(dirname2))
continue;
- if (is_device(dirname2))
- device_list_insert(dirname2);
+ device_list_insert(dirname2);
}
closedir(dir2);
}
strlcat(dirname2, dent2->d_name, sizeof(dirname2));
if (attr_filtered(dirname2))
continue;
- if (is_device(dirname2))
- device_list_insert(dirname2);
+ device_list_insert(dirname2);
}
closedir(dir2);
}
if (dir != NULL) {
for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) {
char device[PATH_SIZE];
- size_t start, end, i;
+ size_t start;
if (dent->d_name[0] == '.')
continue;
- strlcpy(device, sysfs_path, sizeof(device));
- start = strlcat(device, "/", sizeof(device));
- end = strlcat(device, dent->d_name, sizeof(device));
- if (end > sizeof(device))
- end = sizeof(device);
-
- /* replace PATH_TO_NAME_CHAR with '/' */
- for (i = start; i < end; i++)
- if (device[i] == PATH_TO_NAME_CHAR)
- device[i] = '/';
-
- if (is_device(device))
- device_list_insert(device);
- else
- continue;
+ start = strlcpy(device, sysfs_path, sizeof(device));
+ strlcat(device, dent->d_name, sizeof(device));
+ path_decode(&device[start]);
+ device_list_insert(device);
}
closedir(dir);
}
{
int failed = 0;
int option;
- struct option options[] = {
+ static const struct option options[] = {
{ "verbose", 0, NULL, 'v' },
{ "dry-run", 0, NULL, 'n' },
{ "retry-failed", 0, NULL, 'F' },
failed = 1;
break;
case 's':
- name_list_add(&filter_subsytem_match_list, optarg, 0);
+ name_list_add(&filter_subsystem_match_list, optarg, 0);
break;
case 'S':
- name_list_add(&filter_subsytem_nomatch_list, optarg, 0);
+ name_list_add(&filter_subsystem_nomatch_list, optarg, 0);
break;
case 'a':
name_list_add(&filter_attr_match_list, optarg, 0);
if (failed)
scan_failed();
else {
- scan_bus();
- scan_class();
- scan_block();
+ char base[PATH_SIZE];
+ struct stat statbuf;
+
+ /* if we have /sys/subsystem, forget all the old stuff */
+ strlcpy(base, sysfs_path, sizeof(base));
+ strlcat(base, "/subsystem", sizeof(base));
+ if (stat(base, &statbuf) == 0)
+ scan_subsystem("subsystem");
+ else {
+ scan_subsystem("bus");
+ scan_class();
+
+ /* scan "block" if it isn't a "class" */
+ strlcpy(base, sysfs_path, sizeof(base));
+ strlcat(base, "/class/block", sizeof(base));
+ if (stat(base, &statbuf) != 0)
+ scan_block();
+ }
}
- exec_lists();
+ exec_list();
exit:
- name_list_cleanup(&filter_subsytem_match_list);
- name_list_cleanup(&filter_subsytem_nomatch_list);
+ name_list_cleanup(&filter_subsystem_match_list);
+ name_list_cleanup(&filter_subsystem_nomatch_list);
name_list_cleanup(&filter_attr_match_list);
name_list_cleanup(&filter_attr_nomatch_list);
~ianmdlvl / elogind.git / blobdiff