X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=926c4b526ab5a82dd0107af833f5cfaf8569e98b;hp=76de8181d17e6c1fcba9095674477da03ab93988;hb=a743be9a785e1223ce628a4225b63546281d9e66;hpb=6c18b1fb8784606c83adab89e306534d3b943aa3 diff --git a/udev.c b/udev.c index 76de8181d..926c4b526 100644 --- a/udev.c +++ b/udev.c @@ -1,10 +1,8 @@ /* * udev.c * - * Userspace devfs - * - * Copyright (C) 2003,2004 Greg Kroah-Hartman - * Copyright (C) 2004 Kay Sievers + * Copyright (C) 2003-2004 Greg Kroah-Hartman + * Copyright (C) 2004-2005 Kay Sievers * * 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 @@ -30,59 +28,31 @@ #include #include #include +#include #include "libsysfs/sysfs/libsysfs.h" +#include "udev_libc_wrapper.h" #include "udev.h" #include "udev_utils.h" #include "udev_sysfs.h" #include "udev_version.h" -#include "namedev.h" +#include "udev_rules.h" #include "logging.h" - #ifdef USE_LOG -void log_message(int level, const char *format, ...) +void log_message(int priority, const char *format, ...) { va_list args; - if (!udev_log) + if (priority > udev_log_priority) return; va_start(args, format); - vsyslog(level, format, args); + vsyslog(priority, format, args); va_end(args); } #endif -/* decide if we should manage the whole hotplug event - * for now look if the kernel calls udevsend instead of /sbin/hotplug - */ -static int manage_hotplug_event(void) { - char helper[256]; - int fd; - int len; - - /* don't handle hotplug.d if we are called directly */ - if (!getenv("UDEVD_EVENT")) - return 0; - - fd = open("/proc/sys/kernel/hotplug", O_RDONLY); - if (fd < 0) - return 0; - - len = read(fd, helper, 256); - close(fd); - - if (len < 0) - return 0; - helper[len] = '\0'; - - if (strstr(helper, "udevsend")) - return 1; - - return 0; -} - static void asmlinkage sig_handler(int signum) { switch (signum) { @@ -96,16 +66,13 @@ static void asmlinkage sig_handler(int signum) int main(int argc, char *argv[], char *envp[]) { - struct sysfs_class_device *class_dev; - struct sysfs_device *devices_dev; struct udevice udev; - char path[SYSFS_PATH_MAX]; - const char *error; + struct udev_rules rules; const char *action; const char *devpath; const char *subsystem; - int managed_event; struct sigaction act; + int devnull; int retval = -EINVAL; if (argc == 2 && strcmp(argv[1], "-V") == 0) { @@ -113,14 +80,28 @@ int main(int argc, char *argv[], char *envp[]) exit(0); } - logging_init("udev"); - dbg("version %s", UDEV_VERSION); + /* set std fd's to /dev/null, if the kernel forks us, we don't have them at all */ + devnull = open("/dev/null", O_RDWR); + if (devnull >= 0) { + if (devnull != STDIN_FILENO) + dup2(devnull, STDIN_FILENO); + if (devnull != STDOUT_FILENO) + dup2(devnull, STDOUT_FILENO); + if (devnull != STDERR_FILENO) + dup2(devnull, STDERR_FILENO); + if (devnull > STDERR_FILENO) + close(devnull); + } + logging_init("udev"); + if (devnull < 0) + err("fatal, could not open /dev/null"); udev_init_config(); + dbg("version %s", UDEV_VERSION); /* set signal handlers */ memset(&act, 0x00, sizeof(act)); - act.sa_handler = (void (*) (int))sig_handler; + act.sa_handler = (void (*)(int)) sig_handler; sigemptyset (&act.sa_mask); act.sa_flags = 0; sigaction(SIGALRM, &act, NULL); @@ -128,23 +109,7 @@ int main(int argc, char *argv[], char *envp[]) sigaction(SIGTERM, &act, NULL); /* trigger timeout to prevent hanging processes */ - alarm(ALARM_TIMEOUT); - - if (strstr(argv[0], "udevstart") || (argc == 2 && strstr(argv[1], "udevstart"))) { - dbg("udevstart"); - - /* disable all logging, as it's much too slow on some facilities */ - udev_log = 0; - - namedev_init(); - retval = udev_start(); - goto exit; - } - - /* let the executed programs know if we handle the whole hotplug event */ - managed_event = manage_hotplug_event(); - if (managed_event) - setenv("MANAGED_EVENT", "1", 1); + alarm(UDEV_ALARM_TIMEOUT); action = getenv("ACTION"); devpath = getenv("DEVPATH"); @@ -153,92 +118,38 @@ int main(int argc, char *argv[], char *envp[]) if (!subsystem && argc == 2) subsystem = argv[1]; - udev_init_device(&udev, devpath, subsystem); - if (!action || !subsystem || !devpath) { - dbg("action, subsystem or devpath missing"); - goto hotplug; + err("action, subsystem or devpath missing"); + goto exit; } - /* export logging flag, as called scripts may want to do the same as udev */ - if (udev_log) - setenv("UDEV_LOG", "1", 1); - - if (udev.type == BLOCK || udev.type == CLASS || udev.type == NET) { - if (strcmp(action, "add") == 0) { - /* wait for sysfs and possibly add node */ - dbg("udev add"); - - /* skip subsystems without "dev", but handle net devices */ - if (udev.type != NET && subsystem_expect_no_dev(udev.subsystem)) { - dbg("don't care about '%s' devices", udev.subsystem); - goto hotplug; - } - - snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, udev.devpath); - class_dev = wait_class_device_open(path); - if (class_dev == NULL) { - dbg ("open class device failed"); - goto hotplug; - } - dbg("opened class_dev->name='%s'", class_dev->name); - - wait_for_class_device(class_dev, &error); - - /* init rules */ - namedev_init(); - - /* name, create node, store in db */ - retval = udev_add_device(&udev, class_dev); - - sysfs_close_class_device(class_dev); - } else if (strcmp(action, "remove") == 0) { - /* possibly remove a node */ - dbg("udev remove"); - - /* skip subsystems without "dev" */ - if (subsystem_expect_no_dev(udev.subsystem)) { - dbg("don't care about '%s' devices", udev.subsystem); - goto hotplug; - } - - /* get node from db, remove db-entry, delete created node */ - retval = udev_remove_device(&udev); - } + /* export log_priority , as called programs may want to do the same as udev */ + if (udev_log_priority) { + char priority[32]; - /* run dev.d/ scripts if we created/deleted a node or changed a netif name */ - if (udev.devname[0] != '\0') { - setenv("DEVNAME", udev.devname, 1); - if (udev_dev_d) - udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); - } - } else if (udev.type == PHYSDEV) { - if (strcmp(action, "add") == 0) { - /* wait for sysfs */ - dbg("devices add"); - - snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath); - devices_dev = wait_devices_device_open(path); - if (!devices_dev) { - dbg("devices device unavailable (probably remove has beaten us)"); - goto hotplug; - } - dbg("devices device opened '%s'", path); - - wait_for_devices_device(devices_dev, &error); - - sysfs_close_device(devices_dev); - } else if (strcmp(action, "remove") == 0) { - dbg("devices remove"); + sprintf(priority, "%i", udev_log_priority); + setenv("UDEV_LOG", priority, 1); + } + + udev_init_device(&udev, devpath, subsystem, action); + udev_rules_init(&rules, 1, 0); + + retval = udev_process_event(&rules, &udev); + + if (!retval && 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, action); + else + run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO)); } - } else { - dbg("unhandled"); } -hotplug: + udev_rules_close(&rules); udev_cleanup_device(&udev); - if (udev_hotplug_d && managed_event) - udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX); exit: logging_close();