X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=ce96f38879186c81d185f520393a2b18c4428166;hp=0bcbc3973723d605987c31c44b1d8a1903dd0e5e;hb=e79952c59854e6d5fab638262498d8395acd33ff;hpb=e8d569b4145a358775e87058829133fa725b32fd diff --git a/udevstart.c b/udevstart.c index 0bcbc3973..ce96f3887 100644 --- a/udevstart.c +++ b/udevstart.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -76,11 +77,12 @@ static int device_list_insert(const char *path, char *subsystem, struct list_hea { struct device *loop_device; struct device *new_device; + const char *devpath = &path[strlen(sysfs_path)]; - dbg("insert: '%s'\n", path); + dbg("insert: '%s'\n", devpath); list_for_each_entry(loop_device, device_list, node) { - if (strcmp(loop_device->path, path) > 0) { + if (strcmp(loop_device->path, devpath) > 0) { break; } } @@ -91,7 +93,7 @@ static int device_list_insert(const char *path, char *subsystem, struct list_hea return -ENOMEM; } - strlcpy(new_device->path, path, sizeof(new_device->path)); + strlcpy(new_device->path, devpath, sizeof(new_device->path)); strlcpy(new_device->subsys, subsystem, sizeof(new_device->subsys)); list_add_tail(&new_device->node, &loop_device->node); dbg("add '%s' from subsys '%s'", new_device->path, new_device->subsys); @@ -106,17 +108,16 @@ static char *last_list[] = { /* list of devices that we should run first due to any one of a number of reasons */ static char *first_list[] = { - "/class/mem", /* people tend to like their memory devices around first... */ + "/class/mem", + "/class/tty", NULL, }; -static int add_device(const char *path, const char *subsystem) +static int add_device(const char *devpath, const char *subsystem) { struct udevice udev; struct sysfs_class_device *class_dev; - const char *devpath; - - devpath = &path[strlen(sysfs_path)]; + char path[PATH_SIZE]; /* clear and set environment for next event */ clearenv(); @@ -128,8 +129,10 @@ static int add_device(const char *path, const char *subsystem) setenv("UDEV_LOG", udev_log_str, 1); if (udev_run_str) setenv("UDEV_RUN", udev_run_str, 1); - dbg("exec: '%s' (%s)\n", devpath, path); + dbg("add '%s'", devpath); + snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath); + path[sizeof(path)-1] = '\0'; class_dev = sysfs_open_class_device_path(path); if (class_dev == NULL) { dbg("sysfs_open_class_device_path failed"); @@ -160,8 +163,12 @@ run: struct name_entry *name_loop; dbg("executing run list"); - list_for_each_entry(name_loop, &udev.run_list, node) - execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL); + list_for_each_entry(name_loop, &udev.run_list, node) { + if (strncmp(name_loop->name, "socket:", strlen("socket:")) == 0) + pass_env_to_socket(&name_loop->name[strlen("socket:")], devpath, "add"); + else + run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO)); + } } exit: sysfs_close_class_device(class_dev); @@ -213,12 +220,12 @@ static void exec_list(struct list_head *device_list) } } -static int has_devt(const char *directory) +static int has_devt(const char *path) { char filename[PATH_SIZE]; struct stat statbuf; - snprintf(filename, sizeof(filename), "%s/dev", directory); + snprintf(filename, sizeof(filename), "%s/dev", path); filename[sizeof(filename)-1] = '\0'; if (stat(filename, &statbuf) == 0) @@ -227,12 +234,11 @@ static int has_devt(const char *directory) return 0; } -static void udev_scan_block(void) +static void udev_scan_block(struct list_head *device_list) { char base[PATH_SIZE]; DIR *dir; struct dirent *dent; - LIST_HEAD(device_list); snprintf(base, sizeof(base), "%s/block", sysfs_path); base[sizeof(base)-1] = '\0'; @@ -250,7 +256,7 @@ static void udev_scan_block(void) snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name); dirname[sizeof(dirname)-1] = '\0'; if (has_devt(dirname)) - device_list_insert(dirname, "block", &device_list); + device_list_insert(dirname, "block", device_list); else continue; @@ -267,22 +273,20 @@ static void udev_scan_block(void) dirname2[sizeof(dirname2)-1] = '\0'; if (has_devt(dirname2)) - device_list_insert(dirname2, "block", &device_list); + device_list_insert(dirname2, "block", device_list); } closedir(dir2); } } closedir(dir); } - exec_list(&device_list); } -static void udev_scan_class(void) +static void udev_scan_class(struct list_head *device_list) { char base[PATH_SIZE]; DIR *dir; struct dirent *dent; - LIST_HEAD(device_list); snprintf(base, sizeof(base), "%s/class", sysfs_path); base[sizeof(base)-1] = '\0'; @@ -311,18 +315,14 @@ static void udev_scan_class(void) snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name); dirname2[sizeof(dirname2)-1] = '\0'; - /* pass the net class as it is */ - if (strcmp(dent->d_name, "net") == 0) - device_list_insert(dirname2, "net", &device_list); - else if (has_devt(dirname2)) - device_list_insert(dirname2, dent->d_name, &device_list); + if (has_devt(dirname2) || strcmp(dent->d_name, "net") == 0) + device_list_insert(dirname2, dent->d_name, device_list); } closedir(dir2); } } closedir(dir); } - exec_list(&device_list); } static void asmlinkage sig_handler(int signum) @@ -338,6 +338,7 @@ static void asmlinkage sig_handler(int signum) int main(int argc, char *argv[], char *envp[]) { + LIST_HEAD(device_list); struct sigaction act; logging_init("udevstart"); @@ -363,10 +364,11 @@ int main(int argc, char *argv[], char *envp[]) /* trigger timeout to prevent hanging processes */ alarm(UDEV_ALARM_TIMEOUT); - udev_rules_init(&rules, 1); + udev_rules_init(&rules, 0, 1); - udev_scan_block(); - udev_scan_class(); + udev_scan_class(&device_list); + udev_scan_block(&device_list); + exec_list(&device_list); udev_rules_close(&rules); logging_close();