X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=ce6d6ce9df22a7b2cb9ab3bb84133d25906d2d18;hb=44a523e30d79efc5aca9a05073b32f5924191244;hp=4c67477c202882b6814e97c83005d822053080b8;hpb=8202eb32b97a236dac725bfe24e390840ded7098;p=elogind.git

diff --git a/udev.c b/udev.c
index 4c67477c2..ce6d6ce9d 100644
--- a/udev.c
+++ b/udev.c
@@ -39,17 +39,29 @@
 char **main_argv;
 char **main_envp;
 
+#ifdef LOG
+unsigned char logname[42];
+void log_message (int level, const char *format, ...)
+{
+	va_list	args;
+
+	if (!udev_log)
+		return;
+
+	va_start(args, format);
+	vsyslog(level, format, args);
+	va_end(args);
+}
+#endif
+
 static void sig_handler(int signum)
 {
-	dbg("caught signal %d", signum);
 	switch (signum) {
 		case SIGINT:
 		case SIGTERM:
-		case SIGKILL:
 			sysbus_disconnect();
 			udevdb_exit();
 			exit(20 + signum);
-			break;
 		default:
 			dbg("unhandled signal");
 	}
@@ -95,6 +107,7 @@ static int udev_hotplug(int argc, char **argv)
 	char *subsystem;
 	int retval = -EINVAL;
 	int i;
+	struct sigaction act;
 
 	action = get_action();
 	if (!action) {
@@ -141,15 +154,17 @@ static int udev_hotplug(int argc, char **argv)
 	}
 
 	/* set up a default signal handler for now */
-	signal(SIGINT, sig_handler);
-	signal(SIGTERM, sig_handler);
-	signal(SIGKILL, sig_handler);
+	act.sa_handler = sig_handler;
+	sigemptyset (&act.sa_mask);
+	act.sa_flags = SA_RESTART;
+	sigaction(SIGINT, &act, NULL);
+	sigaction(SIGTERM, &act, NULL);
 
 	/* initialize the naming deamon */
 	namedev_init();
 
 	if (strcmp(action, "add") == 0)
-		retval = udev_add_device(devpath, subsystem);
+		retval = udev_add_device(devpath, subsystem, 0);
 
 	else if (strcmp(action, "remove") == 0)
 		retval = udev_remove_device(devpath, subsystem);
@@ -176,6 +191,7 @@ int main(int argc, char **argv, char **envp)
 	main_argv = argv;
 	main_envp = envp;
 
+	init_logging("udev");
 	dbg("version %s", UDEV_VERSION);
 
 	return udev_hotplug(argc, argv);