X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udevstart.c;h=ce96f38879186c81d185f520393a2b18c4428166;hp=4bd47958742da97e4ba1a45193fbdbd4972ab76e;hb=2321ba6fd89635f321ec08fa3803aa7e20aa76bf;hpb=fb39f0566e248c09772ed15a3218ef2381700b6a diff --git a/udevstart.c b/udevstart.c index 4bd479587..ce96f3887 100644 --- a/udevstart.c +++ b/udevstart.c @@ -2,10 +2,12 @@ * udevstart.c * * Copyright (C) 2004 Greg Kroah-Hartman - * + * Copyright (C) 2004 Kay Sievers + * * Quick and dirty way to populate a /dev with udev if your system - * does not have access to a shell. Based originally on a patch to udev - * from Harald Hoyer + * does not have access to a shell. Based originally on a patch + * from: + * Harald Hoyer * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the @@ -31,19 +33,25 @@ #include #include #include +#include #include #include #include #include "libsysfs/sysfs/libsysfs.h" #include "udev_libc_wrapper.h" +#include "udev_sysfs.h" #include "udev.h" #include "udev_version.h" #include "logging.h" -#include "udev_rules.h" #include "udev_utils.h" +#include "udev_rules.h" #include "list.h" +static const char *udev_run_str; +static const char *udev_log_str; +static struct udev_rules rules; + #ifdef USE_LOG void log_message(int priority, const char *format, ...) { @@ -69,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; } } @@ -84,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); @@ -99,39 +108,69 @@ 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]; - /* set environment for callouts and dev.d/ */ + /* clear and set environment for next event */ + clearenv(); + setenv("ACTION", "add", 1); setenv("DEVPATH", devpath, 1); setenv("SUBSYSTEM", subsystem, 1); - - dbg("exec: '%s' (%s)\n", devpath, path); - + setenv("UDEV_START", "1", 1); + if (udev_log_str) + setenv("UDEV_LOG", udev_log_str, 1); + if (udev_run_str) + setenv("UDEV_RUN", udev_run_str, 1); + 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"); - return -ENODEV; + dbg("sysfs_open_class_device_path failed"); + return -1; } udev_init_device(&udev, devpath, subsystem, "add"); - udev_add_device(&udev, class_dev); + udev.devt = get_devt(class_dev); + if (!udev.devt && udev.type != DEV_NET) { + dbg("sysfs_open_class_device_path failed"); + return -1; + } + udev_rules_get_name(&rules, &udev, class_dev); + if (udev.ignore_device) { + dbg("device event will be ignored"); + goto exit; + } + if (udev.name[0] == '\0') { + dbg("device node creation supressed"); + goto run; + } - /* run dev.d/ scripts if we created a node or changed a netif name */ - if (udev_dev_d && udev.devname[0] != '\0') { + udev_add_device(&udev, class_dev); + if (udev.devname[0] != '\0') setenv("DEVNAME", udev.devname, 1); - udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); +run: + if (udev_run && !list_empty(&udev.run_list)) { + struct name_entry *name_loop; + + dbg("executing run list"); + 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); udev_cleanup_device(&udev); @@ -181,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) @@ -195,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'; @@ -218,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; @@ -235,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'; @@ -279,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) @@ -306,14 +338,19 @@ static void asmlinkage sig_handler(int signum) int main(int argc, char *argv[], char *envp[]) { + LIST_HEAD(device_list); struct sigaction act; - logging_init("udev"); + logging_init("udevstart"); udev_init_config(); + dbg("version %s", UDEV_VERSION); + + udev_run_str = getenv("UDEV_RUN"); + udev_log_str = getenv("UDEV_LOG"); + /* disable all logging if not explicitely requested */ - if (getenv("UDEV_LOG") == NULL) + if (udev_log_str == NULL) udev_log_priority = 0; - dbg("version %s", UDEV_VERSION); /* set signal handlers */ memset(&act, 0x00, sizeof(act)); @@ -325,17 +362,15 @@ int main(int argc, char *argv[], char *envp[]) sigaction(SIGTERM, &act, NULL); /* trigger timeout to prevent hanging processes */ - alarm(ALARM_TIMEOUT); + alarm(UDEV_ALARM_TIMEOUT); - /* set environment for executed programs */ - setenv("ACTION", "add", 1); - setenv("UDEV_START", "1", 1); + udev_rules_init(&rules, 0, 1); - udev_rules_init(); - - 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(); return 0; }