* 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
- * 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
#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 "udev.h"
#include "udev_version.h"
#include "logging.h"
-#include "udev_rules.h"
#include "udev_utils.h"
+#include "udev_rules.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, ...)
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) {
dbg("device event will be ignored");
goto exit;
struct name_entry *name_loop;
dbg("executing run list");
- list_for_each_entry(name_loop, &udev.run_list, node)
- execute_program(name_loop->name, udev.subsystem, NULL, 0, NULL);
+ 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:")], devpath, "add");
+ else
+ run_program(name_loop->name, udev.subsystem, NULL, 0, NULL, (udev_log_priority >= LOG_DEBUG));
+ }
}
exit:
sysfs_close_class_device(class_dev);
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))
+ if (has_devt(dirname2) || strcmp(dent->d_name, "net") == 0)
device_list_insert(dirname2, dent->d_name, &device_list);
}
closedir(dir2);
sigaction(SIGTERM, &act, NULL);
/* trigger timeout to prevent hanging processes */
- alarm(ALARM_TIMEOUT);
+ alarm(UDEV_ALARM_TIMEOUT);
- udev_rules_init();
+ udev_rules_init(&rules, 0, 1);
udev_scan_block();
udev_scan_class();
+ udev_rules_close(&rules);
logging_close();
return 0;
}