X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=7564c3de03d5d9e98924bc9abe22e515b0b9cd37;hp=cb1c78888c299953b63fcef522d65470c146c886;hb=472419869c387bb0963d8cfecca997b8154f4d44;hpb=aee380b6d8f849c21a5cc54e5d8f2a43fb88b2f2 diff --git a/udevstart.c b/udevstart.c index cb1c78888..7564c3de0 100644 --- a/udevstart.c +++ b/udevstart.c @@ -26,36 +26,44 @@ #include #include #include +#include #include #include #include +#include #include +#include #include -#include +#include "libsysfs/sysfs/libsysfs.h" +#include "udev_libc_wrapper.h" +#include "udev.h" #include "logging.h" -#include "udev_lib.h" +#include "namedev.h" +#include "udev_utils.h" #include "list.h" -#include "udev.h" - -#define MAX_PATHLEN 1024 -#define SYSBLOCK "/sys/block" -#define SYSCLASS "/sys/class" +#ifdef USE_LOG +void log_message(int level, const char *format, ...) +{ +} +#endif struct device { - struct list_head list; - char path[MAX_PATHLEN]; - char subsys[MAX_PATHLEN]; + struct list_head node; + char path[PATH_SIZE]; + char subsys[NAME_SIZE]; }; /* sort files in lexical order */ -static int device_list_insert(char *path, char *subsystem, struct list_head *device_list) +static int device_list_insert(const char *path, char *subsystem, struct list_head *device_list) { struct device *loop_device; struct device *new_device; - list_for_each_entry(loop_device, device_list, list) { + dbg("insert: '%s'\n", path); + + list_for_each_entry(loop_device, device_list, node) { if (strcmp(loop_device->path, path) > 0) { break; } @@ -67,9 +75,9 @@ static int device_list_insert(char *path, char *subsystem, struct list_head *dev return -ENOMEM; } - strfieldcpy(new_device->path, path); - strfieldcpy(new_device->subsys, subsystem); - list_add_tail(&new_device->list, &loop_device->list); + strlcpy(new_device->path, path, 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); return 0; } @@ -80,16 +88,69 @@ static char *last_list[] = { NULL, }; +/* 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... */ + NULL, +}; + +static int add_device(const char *path, const char *subsystem) +{ + struct udevice udev; + struct sysfs_class_device *class_dev; + const char *devpath; + + devpath = &path[strlen(sysfs_path)]; + + /* set environment for callouts and dev.d/ */ + setenv("DEVPATH", devpath, 1); + setenv("SUBSYSTEM", subsystem, 1); + + dbg("exec: '%s' (%s)\n", devpath, path); + + class_dev = sysfs_open_class_device_path(path); + if (class_dev == NULL) { + dbg ("sysfs_open_class_device_path failed"); + return -ENODEV; + } + + udev_init_device(&udev, devpath, subsystem); + udev_add_device(&udev, class_dev); + + /* run dev.d/ scripts if we created a node or changed a netif name */ + if (udev_dev_d && udev.devname[0] != '\0') { + setenv("DEVNAME", udev.devname, 1); + udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); + } + + sysfs_close_class_device(class_dev); + udev_cleanup_device(&udev); + + return 0; +} + static void exec_list(struct list_head *device_list) { struct device *loop_device; struct device *tmp_device; + int i; + + /* handle the "first" type devices first */ + list_for_each_entry_safe(loop_device, tmp_device, device_list, node) { + for (i = 0; first_list[i] != NULL; i++) { + if (strncmp(loop_device->path, first_list[i], strlen(first_list[i])) == 0) { + add_device(loop_device->path, loop_device->subsys); + list_del(&loop_device->node); + free(loop_device); + break; + } + } + } /* handle the devices we are allowed to, excluding the "last" type devices */ - list_for_each_entry_safe(loop_device, tmp_device, device_list, list) { + list_for_each_entry_safe(loop_device, tmp_device, device_list, node) { int found = 0; - int i; - for (i=0; last_list[i] != NULL; i++) { + for (i = 0; last_list[i] != NULL; i++) { if (strncmp(loop_device->path, last_list[i], strlen(last_list[i])) == 0) { found = 1; break; @@ -98,147 +159,168 @@ static void exec_list(struct list_head *device_list) if (found) continue; - udev_add_device(loop_device->path, loop_device->subsys, NOFAKE); - list_del(&loop_device->list); + add_device(loop_device->path, loop_device->subsys); + list_del(&loop_device->node); free(loop_device); } /* handle the rest of the devices left over, if any */ - list_for_each_entry_safe(loop_device, tmp_device, device_list, list) { - udev_add_device(loop_device->path, loop_device->subsys, NOFAKE); - list_del(&loop_device->list); + list_for_each_entry_safe(loop_device, tmp_device, device_list, node) { + add_device(loop_device->path, loop_device->subsys); + list_del(&loop_device->node); free(loop_device); } } +static int has_devt(const char *directory) +{ + char filename[PATH_SIZE]; + struct stat statbuf; + + snprintf(filename, sizeof(filename), "%s/dev", directory); + filename[sizeof(filename)-1] = '\0'; + + if (stat(filename, &statbuf) == 0) + return 1; + + return 0; +} + static void udev_scan_block(void) { + char base[PATH_SIZE]; DIR *dir; struct dirent *dent; LIST_HEAD(device_list); - dir = opendir(SYSBLOCK); + snprintf(base, sizeof(base), "%s/block", sysfs_path); + base[sizeof(base)-1] = '\0'; + + dir = opendir(base); if (dir != NULL) { for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { - char dirname[MAX_PATHLEN]; + char dirname[PATH_SIZE]; DIR *dir2; struct dirent *dent2; - if ((strcmp(dent->d_name, ".") == 0) || - (strcmp(dent->d_name, "..") == 0)) + if (dent->d_name[0] == '.') continue; - snprintf(dirname, MAX_PATHLEN, "/block/%s", dent->d_name); - dirname[MAX_PATHLEN-1] = '\0'; - device_list_insert(dirname, "block", &device_list); + 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); + else + continue; - snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSBLOCK, dent->d_name); + /* look for partitions */ dir2 = opendir(dirname); if (dir2 != NULL) { for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) { - char dirname2[MAX_PATHLEN]; - DIR *dir3; - struct dirent *dent3; + char dirname2[PATH_SIZE]; - if ((strcmp(dent2->d_name, ".") == 0) || - (strcmp(dent2->d_name, "..") == 0)) + if (dent2->d_name[0] == '.') continue; - snprintf(dirname2, MAX_PATHLEN, "%s/%s", dirname, dent2->d_name); - dirname2[MAX_PATHLEN-1] = '\0'; - - dir3 = opendir(dirname2); - if (dir3 != NULL) { - for (dent3 = readdir(dir3); dent3 != NULL; dent3 = readdir(dir3)) { - char filename[MAX_PATHLEN]; - - if (strcmp(dent3->d_name, "dev") == 0) { - snprintf(filename, MAX_PATHLEN, "/block/%s/%s", - dent->d_name, dent2->d_name); - filename[MAX_PATHLEN-1] = '\0'; - device_list_insert(filename, "block", &device_list); - } - } - closedir(dir3); - } + snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name); + dirname2[sizeof(dirname2)-1] = '\0'; + + if (has_devt(dirname2)) + device_list_insert(dirname2, "block", &device_list); } closedir(dir2); } } closedir(dir); } - exec_list(&device_list); } static void udev_scan_class(void) { + char base[PATH_SIZE]; DIR *dir; struct dirent *dent; LIST_HEAD(device_list); - dir = opendir(SYSCLASS); + snprintf(base, sizeof(base), "%s/class", sysfs_path); + base[sizeof(base)-1] = '\0'; + + dir = opendir(base); if (dir != NULL) { for (dent = readdir(dir); dent != NULL; dent = readdir(dir)) { - char dirname[MAX_PATHLEN]; + char dirname[PATH_SIZE]; DIR *dir2; struct dirent *dent2; - if ((strcmp(dent->d_name, ".") == 0) || - (strcmp(dent->d_name, "..") == 0)) + if (dent->d_name[0] == '.') continue; - snprintf(dirname, MAX_PATHLEN, "%s/%s", SYSCLASS, dent->d_name); - dirname[MAX_PATHLEN-1] = '\0'; + snprintf(dirname, sizeof(dirname), "%s/%s", base, dent->d_name); + dirname[sizeof(dirname)-1] = '\0'; + dir2 = opendir(dirname); if (dir2 != NULL) { for (dent2 = readdir(dir2); dent2 != NULL; dent2 = readdir(dir2)) { - char dirname2[MAX_PATHLEN-1]; - DIR *dir3; - struct dirent *dent3; + char dirname2[PATH_SIZE]; - if ((strcmp(dent2->d_name, ".") == 0) || - (strcmp(dent2->d_name, "..") == 0)) + if (dent2->d_name[0] == '.') continue; + 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) { - snprintf(dirname2, MAX_PATHLEN, "/class/net/%s", dent2->d_name); + if (strcmp(dent->d_name, "net") == 0) device_list_insert(dirname2, "net", &device_list); - continue; - } - - snprintf(dirname2, MAX_PATHLEN, "%s/%s", dirname, dent2->d_name); - dirname2[MAX_PATHLEN-1] = '\0'; - dir3 = opendir(dirname2); - if (dir3 != NULL) { - for (dent3 = readdir(dir3); dent3 != NULL; dent3 = readdir(dir3)) { - char filename[MAX_PATHLEN]; - - /* pass devices with a "dev" file */ - if (strcmp(dent3->d_name, "dev") == 0) { - snprintf(filename, MAX_PATHLEN, "/class/%s/%s", - dent->d_name, dent2->d_name); - filename[MAX_PATHLEN-1] = '\0'; - device_list_insert(filename, dent->d_name, &device_list); - break; - } - } - closedir(dir3); - } + else if (has_devt(dirname2)) + device_list_insert(dirname2, dent->d_name, &device_list); } closedir(dir2); } } closedir(dir); } - exec_list(&device_list); } -int udev_start(void) +static void asmlinkage sig_handler(int signum) { - udev_scan_class(); + switch (signum) { + case SIGALRM: + exit(1); + case SIGINT: + case SIGTERM: + exit(20 + signum); + } +} + +int main(int argc, char *argv[], char *envp[]) +{ + struct sigaction act; + + udev_init_config(); + + /* set signal handlers */ + memset(&act, 0x00, sizeof(act)); + act.sa_handler = (void (*) (int))sig_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = 0; + sigaction(SIGALRM, &act, NULL); + sigaction(SIGINT, &act, NULL); + sigaction(SIGTERM, &act, NULL); + + /* trigger timeout to prevent hanging processes */ + alarm(ALARM_TIMEOUT); + + /* set environment for executed programs */ + setenv("ACTION", "add", 1); + setenv("UDEV_START", "1", 1); + + namedev_init(); + udev_scan_block(); + udev_scan_class(); + return 0; }