X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev.c;h=0ef4cf8657f17d79e0bf3628fb7a5ec15e7ff8c6;hp=1220e637e5ce1befce760ac9231dbf2e95814bae;hb=eb6c7cd03635ffc28798734f0b87b9e21dae6f9e;hpb=2a94c8777eacff16821a06368092852f7b42882f

diff --git a/udev.c b/udev.c
index 1220e637e..0ef4cf865 100644
--- a/udev.c
+++ b/udev.c
@@ -32,7 +32,6 @@
 #include "udev.h"
 #include "udev_lib.h"
 #include "udev_version.h"
-#include "udev_dbus.h"
 #include "logging.h"
 #include "namedev.h"
 #include "udevdb.h"
@@ -41,6 +40,9 @@
 char **main_argv;
 char **main_envp;
 
+/* local variables */
+static int is_udevstart;
+
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
 void log_message(int level, const char *format, ...)
@@ -56,21 +58,19 @@ void log_message(int level, const char *format, ...)
 }
 #endif
 
-static void sig_handler(int signum)
+asmlinkage static void sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGINT:
 		case SIGTERM:
-			sysbus_disconnect();
 			udevdb_exit();
 			exit(20 + signum);
 		default:
-			dbg("unhandled signal");
+			dbg("unhandled signal %d", signum);
 	}
 }
 
 static char *subsystem_blacklist[] = {
-	"net",
 	"scsi_host",
 	"scsi_device",
 	"usb_host",
@@ -79,26 +79,13 @@ static char *subsystem_blacklist[] = {
 	""
 };
 
-static int udev_hotplug(void)
+int __udev_hotplug(char *action, const char *devpath, const char *subsystem)
 {
-	char *action;
-	char *devpath;
-	char *subsystem;
 	int retval = -EINVAL;
 	int i;
 	struct sigaction act;
+	const int nofake = 0;
 
-	action = get_action();
-	if (!action) {
-		dbg("no action?");
-		goto exit;
-	}
-
-	devpath = get_devpath();
-	if (!devpath) {
-		dbg("no devpath?");
-		goto exit;
-	}
 	dbg("looking at '%s'", devpath);
 
 	/* we only care about class devices and block stuff */
@@ -108,12 +95,6 @@ static int udev_hotplug(void)
 		goto exit;
 	}
 
-	/* skip blacklisted subsystems */
-	subsystem = get_subsystem(main_argv[1]);
-	if (!subsystem) {
-		dbg("no subsystem?");
-		goto exit;
-	}
 	i = 0;
 	while (subsystem_blacklist[i][0] != '\0') {
 		if (strcmp(subsystem, subsystem_blacklist[i]) == 0) {
@@ -123,17 +104,14 @@ static int udev_hotplug(void)
 		i++;
 	}
 
-	/* connect to the system message bus */
-	sysbus_connect();
-
 	/* initialize udev database */
 	retval = udevdb_init(UDEVDB_DEFAULT);
 	if (retval != 0) {
 		dbg("unable to initialize database");
-		goto exit_sysbus;
+		goto exit;
 	}
 
-	/* set up a default signal handler for now */
+	/* set signal handlers */
 	act.sa_handler = sig_handler;
 	sigemptyset (&act.sa_mask);
 	act.sa_flags = SA_RESTART;
@@ -141,28 +119,54 @@ static int udev_hotplug(void)
 	sigaction(SIGTERM, &act, NULL);
 
 	if (strcmp(action, "add") == 0) {
-		namedev_init();
-		retval = udev_add_device(devpath, subsystem, 0);
-	} else {
-		if (strcmp(action, "remove") == 0) {
-			retval = udev_remove_device(devpath, subsystem);
-		} else {
-			dbg("unknown action '%s'", action);
-			retval = -EINVAL;
-		}
+		/* Already done. */
+		if (!is_udevstart)
+			namedev_init();
+		retval = udev_add_device(devpath, subsystem, nofake);
+		goto action_done;
 	}
 
-	udevdb_exit();
+	if (strcmp(action, "remove") == 0) {
+		retval = udev_remove_device(devpath, subsystem);
+		goto action_done;
+	}
+
+	dbg("unknown action '%s'", action);
+	retval = -EINVAL;
 
-exit_sysbus:
-	/* disconnect from the system message bus */
-	sysbus_disconnect();
+action_done:
+	udevdb_exit();
 
 exit:
-	if (retval > 0)
-		retval = 0;
+	return retval;
+}
+
+static int udev_hotplug(void)
+{
+	char *action;
+	char *devpath;
+	char *subsystem;
 
-	return -retval;
+	action = get_action();
+	if (!action) {
+		dbg("no action?");
+		return -EINVAL;
+	}
+
+	devpath = get_devpath();
+	if (!devpath) {
+		dbg("no devpath?");
+		return -EINVAL;
+	}
+
+	/* skip blacklisted subsystems */
+	subsystem = get_subsystem(main_argv[1]);
+	if (!subsystem) {
+		dbg("no subsystem?");
+		return -EINVAL;
+	}
+
+	return __udev_hotplug(action, devpath, subsystem);
 }
 
 int main(int argc, char *argv[], char *envp[])
@@ -170,12 +174,17 @@ int main(int argc, char *argv[], char *envp[])
 	main_argv = argv;
 	main_envp = envp;
 
-	init_logging("udev");
+	if (strstr(argv[0], "udevstart"))
+		is_udevstart = 1;
 
 	/* initialize our configuration */
 	udev_init_config();
 
 	dbg("version %s", UDEV_VERSION);
 
-	return udev_hotplug();
+	if (is_udevstart) {
+		namedev_init();
+		return udev_start();
+	} else
+		return udev_hotplug();
 }