chiark / gitweb /
usb_id: don't fail on other subsytems than "scsi"
[elogind.git] / udevstart.c
index 7564c3d..8c414f1 100644 (file)
@@ -2,10 +2,12 @@
  * udevstart.c
  *
  * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
  * udevstart.c
  *
  * Copyright (C) 2004 Greg Kroah-Hartman <greg@kroah.com>
- * 
+ * Copyright (C) 2004 Kay Sievers <kay@vrfy.org>
+ *
  * Quick and dirty way to populate a /dev with udev if your system
  * 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 <harald@redhat.com>
+ * does not have access to a shell.  Based originally on a patch
+ * from:
+ *     Harald Hoyer <harald@redhat.com>
  *
  *     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
  *
  *     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
 #include <ctype.h>
 #include <dirent.h>
 #include <signal.h>
 #include <ctype.h>
 #include <dirent.h>
 #include <signal.h>
+#include <syslog.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#include "libsysfs/sysfs/libsysfs.h"
-#include "udev_libc_wrapper.h"
 #include "udev.h"
 #include "udev.h"
-#include "logging.h"
-#include "namedev.h"
-#include "udev_utils.h"
-#include "list.h"
+#include "udev_rules.h"
+
+static const char *udev_run_str;
+static const char *udev_log_str;
+static struct udev_rules rules;
 
 #ifdef USE_LOG
 
 #ifdef USE_LOG
-void log_message(int level, const char *format, ...)
+void log_message(int priority, const char *format, ...)
 {
 {
+       va_list args;
+
+       if (priority > udev_log_priority)
+               return;
+
+       va_start(args, format);
+       vsyslog(priority, format, args);
+       va_end(args);
 }
 #endif
 
 struct device {
        struct list_head node;
        char path[PATH_SIZE];
 }
 #endif
 
 struct device {
        struct list_head node;
        char path[PATH_SIZE];
-       char subsys[NAME_SIZE];
 };
 
 /* sort files in lexical order */
 };
 
 /* sort files in lexical order */
-static int device_list_insert(const char *path, char *subsystem, struct list_head *device_list)
+static int device_list_insert(const char *path, struct list_head *device_list)
 {
        struct device *loop_device;
        struct device *new_device;
 {
        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) {
 
        list_for_each_entry(loop_device, device_list, node) {
-               if (strcmp(loop_device->path, path) > 0) {
+               if (strcmp(loop_device->path, devpath) > 0) {
                        break;
                }
        }
                        break;
                }
        }
@@ -75,10 +85,9 @@ static int device_list_insert(const char *path, char *subsystem, struct list_hea
                return -ENOMEM;
        }
 
                return -ENOMEM;
        }
 
-       strlcpy(new_device->path, path, sizeof(new_device->path));
-       strlcpy(new_device->subsys, subsystem, sizeof(new_device->subsys));
+       strlcpy(new_device->path, devpath, sizeof(new_device->path));
        list_add_tail(&new_device->node, &loop_device->node);
        list_add_tail(&new_device->node, &loop_device->node);
-       dbg("add '%s' from subsys '%s'", new_device->path, new_device->subsys);
+       dbg("add '%s'" , new_device->path);
        return 0;
 }
 
        return 0;
 }
 
@@ -90,41 +99,73 @@ 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[] = {
 
 /* 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,
 };
 
        NULL,
 };
 
-static int add_device(const char *path, const char *subsystem)
+static int add_device(const char *devpath)
 {
 {
-       struct udevice udev;
-       struct sysfs_class_device *class_dev;
-       const char *devpath;
-
-       devpath = &path[strlen(sysfs_path)];
+       struct sysfs_device *dev;
+       struct udevice *udev;
 
 
-       /* set environment for callouts and dev.d/ */
-       setenv("DEVPATH", devpath, 1);
-       setenv("SUBSYSTEM", subsystem, 1);
+       /* clear and set environment for next event */
+       clearenv();
+       setenv("ACTION", "add", 1);
+       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);
+
+       dev = sysfs_device_get(devpath);
+       if (dev == NULL)
+               return -1;
+
+       udev = udev_device_init();
+       if (udev == NULL)
+               return -1;
+
+       /* override built-in sysfs device */
+       udev->dev = dev;
+       strcpy(udev->action, "add");
+       udev->devt = udev_device_get_devt(udev);
+
+       if (strcmp(udev->dev->subsystem, "net") != 0) {
+               udev->devt = udev_device_get_devt(udev);
+               if (major(udev->devt) == 0)
+                       return -1;
+       }
 
 
-       dbg("exec: '%s' (%s)\n", devpath, path);
+       dbg("add '%s'", udev->dev->devpath);
+       setenv("DEVPATH", udev->dev->devpath, 1);
+       setenv("SUBSYSTEM", udev->dev->subsystem, 1);
 
 
-       class_dev = sysfs_open_class_device_path(path);
-       if (class_dev == NULL) {
-               dbg ("sysfs_open_class_device_path failed");
-               return -ENODEV;
+       udev_rules_get_name(&rules, udev);
+       if (udev->ignore_device) {
+               dbg("device event will be ignored");
+               goto exit;
+       }
+       if (udev->name[0] == '\0') {
+               dbg("device node creation supressed");
+               goto run;
        }
 
        }
 
-       udev_init_device(&udev, devpath, subsystem);
-       udev_add_device(&udev, class_dev);
+       udev_add_device(udev);
+run:
+       if (udev_run && !list_empty(&udev->run_list)) {
+               struct name_entry *name_loop;
 
 
-       /* 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);
+               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:")], udev->dev->devpath, "add");
+                       else
+                               run_program(name_loop->name, udev->dev->subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_INFO));
+               }
        }
        }
-
-       sysfs_close_class_device(class_dev);
-       udev_cleanup_device(&udev);
+exit:
+       udev_device_cleanup(udev);
 
        return 0;
 }
 
        return 0;
 }
@@ -139,7 +180,7 @@ static void exec_list(struct list_head *device_list)
        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) {
        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);
+                               add_device(loop_device->path);
                                list_del(&loop_device->node);
                                free(loop_device);
                                break;
                                list_del(&loop_device->node);
                                free(loop_device);
                                break;
@@ -159,25 +200,25 @@ static void exec_list(struct list_head *device_list)
                if (found)
                        continue;
 
                if (found)
                        continue;
 
-               add_device(loop_device->path, loop_device->subsys);
+               add_device(loop_device->path);
                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, node) {
                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, node) {
-               add_device(loop_device->path, loop_device->subsys);
+               add_device(loop_device->path);
                list_del(&loop_device->node);
                free(loop_device);
        }
 }
 
                list_del(&loop_device->node);
                free(loop_device);
        }
 }
 
-static int has_devt(const char *directory)
+static int has_devt(const char *path)
 {
        char filename[PATH_SIZE];
        struct stat statbuf;
 
 {
        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)
        filename[sizeof(filename)-1] = '\0';
 
        if (stat(filename, &statbuf) == 0)
@@ -186,12 +227,11 @@ static int has_devt(const char *directory)
        return 0;
 }
 
        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;
 {
        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';
 
        snprintf(base, sizeof(base), "%s/block", sysfs_path);
        base[sizeof(base)-1] = '\0';
@@ -209,7 +249,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))
                        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, device_list);
                        else
                                continue;
 
                        else
                                continue;
 
@@ -226,22 +266,20 @@ static void udev_scan_block(void)
                                        dirname2[sizeof(dirname2)-1] = '\0';
 
                                        if (has_devt(dirname2))
                                        dirname2[sizeof(dirname2)-1] = '\0';
 
                                        if (has_devt(dirname2))
-                                               device_list_insert(dirname2, "block", &device_list);
+                                               device_list_insert(dirname2, device_list);
                                }
                                closedir(dir2);
                        }
                }
                closedir(dir);
        }
                                }
                                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;
 {
        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';
 
        snprintf(base, sizeof(base), "%s/class", sysfs_path);
        base[sizeof(base)-1] = '\0';
@@ -270,18 +308,14 @@ static void udev_scan_class(void)
                                        snprintf(dirname2, sizeof(dirname2), "%s/%s", dirname, dent2->d_name);
                                        dirname2[sizeof(dirname2)-1] = '\0';
 
                                        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, device_list);
                                }
                                closedir(dir2);
                        }
                }
                closedir(dir);
        }
                                }
                                closedir(dir2);
                        }
                }
                closedir(dir);
        }
-       exec_list(&device_list);
 }
 
 static void asmlinkage sig_handler(int signum)
 }
 
 static void asmlinkage sig_handler(int signum)
@@ -297,9 +331,19 @@ static void asmlinkage sig_handler(int signum)
 
 int main(int argc, char *argv[], char *envp[])
 {
 
 int main(int argc, char *argv[], char *envp[])
 {
+       LIST_HEAD(device_list);
        struct sigaction act;
 
        struct sigaction act;
 
-       udev_init_config();
+       logging_init("udevstart");
+       udev_config_init();
+       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 (udev_log_str == NULL)
+               udev_log_priority = 0;
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
 
        /* set signal handlers */
        memset(&act, 0x00, sizeof(act));
@@ -311,16 +355,17 @@ int main(int argc, char *argv[], char *envp[])
        sigaction(SIGTERM, &act, NULL);
 
        /* trigger timeout to prevent hanging processes */
        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);
+       alarm(UDEV_ALARM_TIMEOUT);
 
 
-       namedev_init();
+       sysfs_init();
+       udev_rules_init(&rules, 1);
 
 
-       udev_scan_block();
-       udev_scan_class();
+       udev_scan_class(&device_list);
+       udev_scan_block(&device_list);
+       exec_list(&device_list);
 
 
+       udev_rules_cleanup(&rules);
+       sysfs_cleanup();
+       logging_close();
        return 0;
 }
        return 0;
 }