#include <fcntl.h>
#include <syslog.h>
#include <time.h>
+#include <getopt.h>
#include <sys/select.h>
#include <sys/wait.h>
#include <sys/types.h>
#include "udevd.h"
#include "udev_selinux.h"
+static int debug_trace;
+static int verbose;
+
static struct udev_rules rules;
static int udevd_sock = -1;
static int uevent_netlink_sock = -1;
va_start(args, format);
vsyslog(priority, format, args);
va_end(args);
+
+ if (verbose) {
+ va_start(args, format);
+ vprintf(format, args);
+ va_end(args);
+ printf("\n");
+ }
}
+
#endif
static void asmlinkage udev_event_sig_handler(int signum)
{
char filename[PATH_SIZE];
char filename_failed[PATH_SIZE];
- char target[PATH_SIZE];
size_t start, end, i;
struct udevd_uevent_msg *loop_msg;
+ int fd;
/* add location of queue files */
strlcpy(filename, udev_root, sizeof(filename));
case EVENT_QUEUED:
unlink(filename_failed);
delete_path(filename_failed);
-
- strlcpy(target, sysfs_path, sizeof(target));
- strlcat(target, msg->devpath, sizeof(target));
create_path(filename);
- symlink(target, filename);
+ fd = open(filename, O_WRONLY|O_TRUNC|O_CREAT, 0644);
+ if (fd > 0)
+ close(fd);
return;
case EVENT_FINISHED:
case EVENT_FAILED:
export_event_state(msg, EVENT_QUEUED);
+ /* run one event after the other in debug mode */
+ if (debug_trace) {
+ list_add_tail(&msg->node, &running_list);
+ udev_event_run(msg);
+ waitpid(msg->pid, NULL, 0);
+ msg_queue_delete(msg);
+ return;
+ }
+
/* run all events with a timeout set immediately */
if (msg->timeout != 0) {
list_add_tail(&msg->node, &running_list);
fd_set readfds;
const char *value;
int daemonize = 0;
- int i;
+ int option;
+ static const struct option options[] = {
+ { "daemon", 0, NULL, 'd' },
+ { "debug-trace", 0, NULL, 't' },
+ { "verbose", 0, NULL, 'v' },
+ { "help", 0, NULL, 'h' },
+ {}
+ };
int rc = 1;
int maxfd;
selinux_init();
dbg("version %s", UDEV_VERSION);
- if (getuid() != 0) {
- fprintf(stderr, "root privileges required\n");
- err("root privileges required");
- goto exit;
- }
-
/* parse commandline options */
- for (i = 1 ; i < argc; i++) {
- char *arg = argv[i];
- if (strcmp(arg, "--daemon") == 0 || strcmp(arg, "-d") == 0)
+ while (1) {
+ option = getopt_long(argc, argv, "dtvh", options, NULL);
+ if (option == -1)
+ break;
+
+ switch (option) {
+ case 'd':
daemonize = 1;
- else if (strcmp(arg, "--help") == 0 || strcmp(arg, "-h") == 0) {
- printf("Usage: udevd [--help] [--daemon]\n");
+ break;
+ case 't':
+ debug_trace = 1;
+ break;
+ case 'v':
+ verbose = 1;
+ if (udev_log_priority < LOG_INFO)
+ udev_log_priority = LOG_INFO;
+ break;
+ case 'h':
+ printf("Usage: udevd [--help] [--daemon] [--debug-trace] [--verbose]\n");
+ goto exit;
+ default:
goto exit;
- } else {
- fprintf(stderr, "unrecognized option '%s'\n", arg);
- err("unrecognized option '%s'\n", arg);
}
}
+ if (getuid() != 0) {
+ fprintf(stderr, "root privileges required\n");
+ err("root privileges required");
+ goto exit;
+ }
+
/* init sockets to receive events */
if (init_udevd_socket() < 0) {
if (errno == EADDRINUSE) {
goto exit;
}
+ /* setup signal handler pipe */
+ retval = pipe(signal_pipe);
+ if (retval < 0) {
+ err("error getting pipes: %s", strerror(errno));
+ goto exit;
+ }
+
+ retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
+ if (retval < 0) {
+ err("error fcntl on read pipe: %s", strerror(errno));
+ goto exit;
+ }
+ retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
+ if (retval < 0) {
+ err("error fcntl on read pipe: %s", strerror(errno));
+ goto exit;
+ }
+
+ retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
+ if (retval < 0) {
+ err("error fcntl on write pipe: %s", strerror(errno));
+ goto exit;
+ }
+ retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
+ if (retval < 0) {
+ err("error fcntl on write pipe: %s", strerror(errno));
+ goto exit;
+ }
+
/* parse the rules and keep them in memory */
sysfs_init();
udev_rules_init(&rules, 1);
fd = open("/dev/null", O_RDWR);
if (fd >= 0) {
dup2(fd, STDIN_FILENO);
- dup2(fd, STDOUT_FILENO);
+ if (!verbose)
+ dup2(fd, STDOUT_FILENO);
dup2(fd, STDERR_FILENO);
if (fd > STDERR_FILENO)
close(fd);
close(fd);
}
- /* setup signal handler pipe */
- retval = pipe(signal_pipe);
- if (retval < 0) {
- err("error getting pipes: %s", strerror(errno));
- goto exit;
- }
-
- retval = fcntl(signal_pipe[READ_END], F_GETFL, 0);
- if (retval < 0) {
- err("error fcntl on read pipe: %s", strerror(errno));
- goto exit;
- }
- retval = fcntl(signal_pipe[READ_END], F_SETFL, retval | O_NONBLOCK);
- if (retval < 0) {
- err("error fcntl on read pipe: %s", strerror(errno));
- goto exit;
- }
-
- retval = fcntl(signal_pipe[WRITE_END], F_GETFL, 0);
- if (retval < 0) {
- err("error fcntl on write pipe: %s", strerror(errno));
- goto exit;
- }
- retval = fcntl(signal_pipe[WRITE_END], F_SETFL, retval | O_NONBLOCK);
- if (retval < 0) {
- err("error fcntl on write pipe: %s", strerror(errno));
- goto exit;
- }
-
/* set signal handlers */
memset(&act, 0x00, sizeof(struct sigaction));
act.sa_handler = (void (*)(int)) sig_handler;
/* watch rules directory */
inotify_fd = inotify_init();
if (inotify_fd >= 0)
- inotify_add_watch(inotify_fd, udev_rules_filename, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
+ inotify_add_watch(inotify_fd, udev_rules_dir, IN_CREATE | IN_DELETE | IN_MOVE | IN_CLOSE_WRITE);
else if (errno == ENOSYS)
err("the kernel does not support inotify, udevd can't monitor configuration file changes");
else
/* export log_priority , as called programs may want to follow that setting */
sprintf(udev_log, "UDEV_LOG=%i", udev_log_priority);
putenv(udev_log);
+ if (debug_trace)
+ putenv("DEBUG=1");
maxfd = udevd_sock;
maxfd = UDEV_MAX(maxfd, uevent_netlink_sock);
~ianmdlvl / elogind.git / blobdiff