X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=2be4c357408d7f266da37a3b4303071f7822bfff;hp=b1ba1435e7236926e905e7f20959058954b906fe;hb=88f4b6485e2a551de55fd9d39aeef89debf3121c;hpb=51737eb8b8087d3d9c0cbad8caeaed9efde907fe diff --git a/udev.c b/udev.c index b1ba1435e..2be4c3574 100644 --- a/udev.c +++ b/udev.c @@ -32,54 +32,58 @@ #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 LOG -unsigned char logname[LOGNAME_SIZE]; -void log_message(int level, const char *format, ...) +#ifdef USE_LOG +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 -/* (for now) true if udevsend is the helper */ +/* Decide if we should manage the whole uevent, including multiplexing + * of the hotplug directories. + * For now look if the kernel calls udevsend instead of /sbin/hotplug, + * or the uevent-helper in /proc/sys/kernel/hotplug is empty. + */ static int manage_hotplug_event(void) { char helper[256]; int fd; int len; - /* false, if we are called directly */ - if (!getenv("MANAGED_EVENT")) - goto exit; + /* 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) - goto exit; + return 0; - len = read(fd, helper, 256); + len = read(fd, helper, sizeof(helper)-1); close(fd); if (len < 0) - goto exit; + return 0; helper[len] = '\0'; + if (helper[0] == '\0' || helper[0] == '\n') + return 1; if (strstr(helper, "udevsend")) return 1; -exit: return 0; } @@ -96,16 +100,17 @@ static void asmlinkage sig_handler(int signum) int main(int argc, char *argv[], char *envp[]) { - struct sigaction act; struct sysfs_class_device *class_dev; struct sysfs_device *devices_dev; struct udevice udev; - char path[SYSFS_PATH_MAX]; - int retval = -EINVAL; + char path[PATH_SIZE]; const char *error; - const char *action = getenv("ACTION"); - const char *devpath = getenv("DEVPATH"); - const char *subsystem = argv[1]; + const char *action; + const char *devpath; + const char *subsystem; + int managed_event; + struct sigaction act; + int retval = -EINVAL; if (argc == 2 && strcmp(argv[1], "-V") == 0) { printf("%s\n", UDEV_VERSION); @@ -113,12 +118,12 @@ int main(int argc, char *argv[], char *envp[]) } logging_init("udev"); - dbg("version %s", UDEV_VERSION); - udev_init_config(); + dbg("version %s", UDEV_VERSION); /* set signal handlers */ - act.sa_handler = (void (*) (int))sig_handler; + memset(&act, 0x00, sizeof(act)); + act.sa_handler = (void (*)(int)) sig_handler; sigemptyset (&act.sa_mask); act.sa_flags = 0; sigaction(SIGALRM, &act, NULL); @@ -128,68 +133,57 @@ int main(int argc, char *argv[], char *envp[]) /* trigger timeout to prevent hanging processes */ alarm(ALARM_TIMEOUT); + /* 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); + action = getenv("ACTION"); devpath = getenv("DEVPATH"); subsystem = getenv("SUBSYSTEM"); /* older kernels passed the SUBSYSTEM only as argument */ if (!subsystem && argc == 2) subsystem = argv[1]; - udev_init_device(&udev, devpath, subsystem); - - 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; + udev_init_device(&udev, devpath, subsystem, action); - namedev_init(); - retval = udev_start(); - goto exit; - } - - if (!action) { - dbg("no action"); + if (!action || !subsystem || !devpath) { + err("action, subsystem or devpath missing"); goto hotplug; } - if (!subsystem) { - dbg("no subsystem"); - goto hotplug; - } + /* export logging flag, as called scripts may want to do the same as udev */ + if (udev_log_priority) { + char priority[32]; - if (!devpath) { - dbg("no devpath"); - goto hotplug; + sprintf(priority, "%i", udev_log_priority); + setenv("UDEV_LOG", priority, 1); } - /* 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 == DEV_BLOCK || udev.type == DEV_CLASS || udev.type == DEV_NET) { + udev_rules_init(); - if ((strncmp(devpath, "/block/", 7) == 0) || (strncmp(devpath, "/class/", 7) == 0)) { 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 != 'n' && subsystem_expect_no_dev(udev.subsystem)) { + if (udev.type != DEV_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); + snprintf(path, sizeof(path), "%s%s", sysfs_path, udev.devpath); + path[sizeof(path)-1] = '\0'; class_dev = wait_class_device_open(path); if (class_dev == NULL) { - dbg ("open class device failed"); + 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, permissions */ - namedev_init(); - /* name, create node, store in db */ retval = udev_add_device(&udev, class_dev); @@ -204,21 +198,38 @@ int main(int argc, char *argv[], char *envp[]) goto hotplug; } + udev_rules_get_run(&udev); + if (udev.ignore_device) { + dbg("device event will be ignored"); + goto hotplug; + } + /* get node from db, remove db-entry, delete created node */ retval = udev_remove_device(&udev); } - /* run dev.d/ scripts if we created/deleted a node or changed a netif name */ - if (udev_dev_d && udev.devname[0] != '\0') { + if (udev.devname[0] != '\0') setenv("DEVNAME", udev.devname, 1); - udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); + + 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) + execute_command(name_loop->name, udev.subsystem); } - } else if ((strncmp(devpath, "/devices/", 9) == 0)) { + + /* run dev.d/ scripts if we created/deleted a node or changed a netif name */ + if (udev_dev_d && udev.devname[0] != '\0') + udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX); + + } else if (udev.type == DEV_DEVICE) { if (strcmp(action, "add") == 0) { /* wait for sysfs */ dbg("devices add"); - snprintf(path, SYSFS_PATH_MAX, "%s%s", sysfs_path, devpath); + snprintf(path, sizeof(path), "%s%s", sysfs_path, devpath); + path[sizeof(path)-1] = '\0'; devices_dev = wait_devices_device_open(path); if (!devices_dev) { dbg("devices device unavailable (probably remove has beaten us)"); @@ -237,10 +248,11 @@ int main(int argc, char *argv[], char *envp[]) } hotplug: - if (udev_hotplug_d && manage_hotplug_event()) + if (udev_hotplug_d && managed_event) udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX); -exit: + udev_cleanup_device(&udev); + logging_close(); return retval; }