X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=90c34d800a9ca22533f276bf475cd7dc6a450e3a;hp=67b86e5916ced757a921bbbd442bee3e876c6298;hb=2410242aa4d21335026d3b90116078c9146a32f3;hpb=5aebfbcb62614fc2bf2b1579d62e3fe272c6751a diff --git a/udev.c b/udev.c index 67b86e591..90c34d800 100644 --- a/udev.c +++ b/udev.c @@ -3,8 +3,7 @@ * * Userspace devfs * - * Copyright (C) 2003 Greg Kroah-Hartman - * + * Copyright (C) 2003,2004 Greg Kroah-Hartman * * 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 @@ -21,126 +20,72 @@ * */ +#include +#include #include #include -#include -#include -#include -#include #include +#include +#include +#include "libsysfs/sysfs/libsysfs.h" #include "udev.h" +#include "udev_lib.h" #include "udev_version.h" +#include "logging.h" #include "namedev.h" #include "udevdb.h" -#include "libsysfs/libsysfs.h" /* global variables */ char **main_argv; char **main_envp; -static inline char *get_action(void) -{ - char *action; - - action = getenv("ACTION"); - return action; -} +/* local variables */ +static int is_udevstart; -static inline char *get_devpath(void) +#ifdef LOG +unsigned char logname[LOGNAME_SIZE]; +void log_message(int level, const char *format, ...) { - char *devpath; + va_list args; - devpath = getenv("DEVPATH"); - return devpath; -} + if (!udev_log) + return; -static inline char *get_seqnum(void) -{ - char *seqnum; - - seqnum = getenv("SEQNUM"); - return seqnum; -} - -#ifdef USE_DBUS - -/** Global variable for the connection the to system message bus or #NULL - * if we cannot connect or acquire the org.kernel.udev service - */ -DBusConnection* sysbus_connection; - -/** Disconnect from the system message bus */ -static void sysbus_disconnect() -{ - if (sysbus_connection == NULL) - return; - - dbus_connection_disconnect(sysbus_connection); - sysbus_connection = NULL; + va_start(args, format); + vsyslog(level, format, args); + va_end(args); } +#endif -/** Connect to the system message bus */ -static void sysbus_connect() +asmlinkage static void sig_handler(int signum) { - DBusError error; - - /* Connect to a well-known bus instance, the system bus */ - dbus_error_init(&error); - sysbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &error); - if (sysbus_connection == NULL) { - dbg("cannot connect to system message bus, error %s: %s", - error.name, error.message); - dbus_error_free(&error); - return; - } - - /* Acquire the org.kernel.udev service such that listeners - * know that the message is really from us and not from a - * random attacker. See the file udev_sysbus_policy.conf for - * details. - * - * Note that a service can have multiple owners (though there - * is a concept of a primary owner for reception of messages) - * so no race is introduced if two copies of udev is running - * at the same time. - */ - dbus_bus_acquire_service(sysbus_connection, "org.kernel.udev", 0, - &error); - if (dbus_error_is_set(&error)) { - printf("cannot acquire org.kernel.udev service, error %s: %s'", - error.name, error.message); - sysbus_disconnect(); - return; - } + switch (signum) { + case SIGINT: + case SIGTERM: + udevdb_exit(); + exit(20 + signum); + default: + dbg("unhandled signal %d", signum); + } } -#endif /* USE_DBUS */ +static char *subsystem_blacklist[] = { + "scsi_host", + "scsi_device", + "usb_host", + "pci_bus", + "pcmcia_socket", + "" +}; -int main(int argc, char **argv, char **envp) +int __udev_hotplug(char *action, const char *devpath, const char *subsystem) { - char *action; - char *devpath; - char *subsystem; int retval = -EINVAL; - - main_argv = argv; - main_envp = envp; - - dbg("version %s", UDEV_VERSION); - - if (argc != 2) { - dbg ("unknown number of arguments"); - goto exit; - } + int i; + struct sigaction act; + const int nofake = 0; - subsystem = argv[1]; - - devpath = get_devpath(); - if (!devpath) { - dbg ("no devpath?"); - goto exit; - } dbg("looking at '%s'", devpath); /* we only care about class devices and block stuff */ @@ -150,26 +95,15 @@ int main(int argc, char **argv, char **envp) goto exit; } - /* but we don't care about net class devices */ - if (strcmp(subsystem, "net") == 0) { - dbg("don't care about net devices"); - goto exit; - } - - action = get_action(); - if (!action) { - dbg ("no action?"); - goto exit; + i = 0; + while (subsystem_blacklist[i][0] != '\0') { + if (strcmp(subsystem, subsystem_blacklist[i]) == 0) { + dbg("don't care about '%s' devices", subsystem); + goto exit; + } + i++; } - /* initialize our configuration */ - udev_init_config(); - -#ifdef USE_DBUS - /* connect to the system message bus */ - sysbus_connect(); -#endif /* USE_DBUS */ - /* initialize udev database */ retval = udevdb_init(UDEVDB_DEFAULT); if (retval != 0) { @@ -177,26 +111,83 @@ int main(int argc, char **argv, char **envp) goto exit; } - /* initialize the naming deamon */ - namedev_init(); - - if (strcmp(action, "add") == 0) - retval = udev_add_device(devpath, subsystem); + /* set signal handlers */ + act.sa_handler = sig_handler; + sigemptyset (&act.sa_mask); + act.sa_flags = SA_RESTART; + sigaction(SIGINT, &act, NULL); + sigaction(SIGTERM, &act, NULL); + + if (strcmp(action, "add") == 0) { + /* Already done. */ + if (!is_udevstart) + namedev_init(); + retval = udev_add_device(devpath, subsystem, nofake); + goto action_done; + } - else if (strcmp(action, "remove") == 0) + if (strcmp(action, "remove") == 0) { retval = udev_remove_device(devpath, subsystem); - - else { - dbg("unknown action '%s'", action); - retval = -EINVAL; + goto action_done; } - udevdb_exit(); -#ifdef USE_DBUS - /* disconnect from the system message bus */ - sysbus_disconnect(); -#endif /* USE_DBUS */ + dbg("unknown action '%s'", action); + retval = -EINVAL; + +action_done: + udevdb_exit(); -exit: +exit: return retval; } + +static int udev_hotplug(void) +{ + char *action; + char *devpath; + char *subsystem; + + action = get_action(); + if (!action) { + dbg("no action?"); + return -EINVAL; + } + + devpath = get_devpath(); + if (!devpath) { + dbg("no devpath?"); + return -EINVAL; + } + + /* skip blacklisted subsystems */ + subsystem = get_subsystem(main_argv[1]); + if (!subsystem) { + dbg("no subsystem?"); + return -EINVAL; + } + + return __udev_hotplug(action, devpath, subsystem); +} + +int main(int argc, char *argv[], char *envp[]) +{ + main_argv = argv; + main_envp = envp; + + if (strstr(argv[0], "udevstart")) { + /* Setup env variables. */ + setenv("UDEV_NO_SLEEP", "1", 1); + is_udevstart = 1; + } + + /* initialize our configuration */ + udev_init_config(); + + dbg("version %s", UDEV_VERSION); + + if (is_udevstart) { + namedev_init(); + return udev_start(); + } else + return udev_hotplug(); +}