#include "udev_utils.h"
#include "list.h"
+static const char *udev_run_str;
+static const char *udev_log_str;
+static struct udev_rules rules;
+
#ifdef USE_LOG
void log_message(int priority, const char *format, ...)
{
const char *devpath;
devpath = &path[strlen(sysfs_path)];
+
+ /* clear and set environment for next event */
+ clearenv();
+ setenv("ACTION", "add", 1);
setenv("DEVPATH", devpath, 1);
setenv("SUBSYSTEM", subsystem, 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);
dbg("exec: '%s' (%s)\n", devpath, path);
class_dev = sysfs_open_class_device_path(path);
if (class_dev == NULL) {
- dbg ("sysfs_open_class_device_path failed");
+ dbg("sysfs_open_class_device_path failed");
return -1;
}
udev_init_device(&udev, devpath, subsystem, "add");
udev.devt = get_devt(class_dev);
- if (!udev.devt) {
- dbg ("sysfs_open_class_device_path failed");
+ if (!udev.devt && udev.type != DEV_NET) {
+ dbg("sysfs_open_class_device_path failed");
return -1;
}
- udev_rules_get_name(&udev, class_dev);
+ udev_rules_get_name(&rules, &udev, class_dev);
if (udev.ignore_device) {
- info("device event will be ignored");
+ dbg("device event will be ignored");
goto exit;
}
if (udev.name[0] == '\0') {
- info("device node creation supressed");
+ dbg("device node creation supressed");
goto run;
}
udev_add_device(&udev, class_dev);
if (udev.devname[0] != '\0')
setenv("DEVNAME", udev.devname, 1);
-
run:
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);
+ execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
}
-
exit:
sysfs_close_class_device(class_dev);
udev_cleanup_device(&udev);
{
struct sigaction act;
- logging_init("udev");
+ logging_init("udevstart");
udev_init_config();
+ 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 (getenv("UDEV_LOG") == NULL)
+ if (udev_log_str == NULL)
udev_log_priority = 0;
- dbg("version %s", UDEV_VERSION);
/* set signal handlers */
memset(&act, 0x00, sizeof(act));
/* trigger timeout to prevent hanging processes */
alarm(ALARM_TIMEOUT);
- /* set environment for executed programs */
- setenv("ACTION", "add", 1);
- setenv("UDEV_START", "1", 1);
-
- udev_rules_init();
+ udev_rules_init(&rules, 1);
udev_scan_block();
udev_scan_class();
+ udev_rules_close(&rules);
logging_close();
return 0;
}