#ifdef LOG
-unsigned char logname[LOGNAME_SIZE];
void log_message(int level, const char *format, ...)
{
va_list args;
}
#endif
-/* (for now) true if udevsend is the helper */
+/* 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;
- /* 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);
close(fd);
if (len < 0)
- goto exit;
+ return 0;
helper[len] = '\0';
if (strstr(helper, "udevsend"))
return 1;
-exit:
return 0;
}
const char *action;
const char *devpath;
const char *subsystem;
+ int managed_event;
int retval = -EINVAL;
if (argc == 2 && strcmp(argv[1], "-V") == 0) {
udev_init_config();
/* set signal handlers */
+ memset(&act, 0x00, sizeof(act));
act.sa_handler = (void (*) (int))sig_handler;
sigemptyset (&act.sa_mask);
act.sa_flags = 0;
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);
+
action = getenv("ACTION");
devpath = getenv("DEVPATH");
subsystem = getenv("SUBSYSTEM");
wait_for_class_device(class_dev, &error);
- /* init rules, permissions */
+ /* init rules */
namedev_init();
/* name, create node, store in db */
}
/* 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_dev_d)
+ udev_multiplex_directory(&udev, DEVD_DIR, DEVD_SUFFIX);
}
} else if ((strncmp(devpath, "/devices/", 9) == 0)) {
if (strcmp(action, "add") == 0) {
}
hotplug:
- if (udev_hotplug_d && manage_hotplug_event())
+ if (udev_hotplug_d && managed_event)
udev_multiplex_directory(&udev, HOTPLUGD_DIR, HOTPLUG_SUFFIX);
exit: