X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev.c;h=a41f22277880be604ab4beef193847373110bbd0;hb=2092fbcdebf5313f29b43bdaa57a22baf0c0269f;hp=cac60fd932bfcff1e3b72d2db1e6431fd73fba0e;hpb=f4949c53e66a4a8697b1bd5aa3f8265faf3423b1;p=elogind.git

diff --git a/udev.c b/udev.c
index cac60fd93..a41f22277 100644
--- a/udev.c
+++ b/udev.c
@@ -34,16 +34,9 @@
 #include "udev_lib.h"
 #include "udev_sysfs.h"
 #include "udev_version.h"
-#include "logging.h"
 #include "namedev.h"
-#include "udevdb.h"
-
-/* timeout flag for udevdb */
-extern sig_atomic_t gotalarm;
+#include "logging.h"
 
-/* global variables */
-char **main_argv;
-char **main_envp;
 
 #ifdef LOG
 unsigned char logname[LOGNAME_SIZE];
@@ -64,15 +57,10 @@ static void asmlinkage sig_handler(int signum)
 {
 	switch (signum) {
 		case SIGALRM:
-			gotalarm = 1;
-			info("error: timeout reached, event probably not handled correctly");
-			break;
+			exit(1);
 		case SIGINT:
 		case SIGTERM:
-			udevdb_exit();
 			exit(20 + signum);
-		default:
-			dbg("unhandled signal %d", signum);
 	}
 }
 
@@ -90,20 +78,15 @@ int main(int argc, char *argv[], char *envp[])
 	} act_type;
 
 	dbg("version %s", UDEV_VERSION);
-
-	main_argv = argv;
-	main_envp = envp;
-
 	logging_init("udev");
-
 	udev_init_config();
 
-	if (strstr(argv[0], "udevstart")) {
+	if (strstr(argv[0], "udevstart") || (argv[1] != NULL && strstr(argv[1], "udevstart"))) {
 		act_type = UDEVSTART;
 	} else {
-		const char *action = get_action();
-		const char *devpath = get_devpath();
-		const char *subsystem = get_subsystem(main_argv[1]);
+		const char *action = getenv("ACTION");
+		const char *devpath = getenv("DEVPATH");
+		const char *subsystem = argv[1];
 
 		if (!action) {
 			dbg("no action?");
@@ -135,7 +118,7 @@ int main(int argc, char *argv[], char *envp[])
 			goto exit;
 		}
 
-		udev_set_values(&udev, devpath, subsystem);
+		udev_set_values(&udev, devpath, subsystem, action);
 
 		/* skip blacklisted subsystems */
 		if (udev.type != 'n' && subsystem_expect_no_dev(subsystem)) {
@@ -148,6 +131,7 @@ int main(int argc, char *argv[], char *envp[])
 	/* set signal handlers */
 	act.sa_handler = (void (*) (int))sig_handler;
 	sigemptyset (&act.sa_mask);
+	act.sa_flags = 0;
 	/* alarm must not restart syscalls*/
 	sigaction(SIGALRM, &act, NULL);
 	sigaction(SIGINT, &act, NULL);
@@ -156,10 +140,6 @@ int main(int argc, char *argv[], char *envp[])
 	/* trigger timout to interrupt blocking syscalls */
 	alarm(ALARM_TIMEOUT);
 
-	/* initialize udev database */
-	if (udevdb_init(UDEVDB_DEFAULT) != 0)
-		info("error: unable to initialize database, continuing without database");
-
 	switch(act_type) {
 	case UDEVSTART:
 		dbg("udevstart");
@@ -184,8 +164,11 @@ int main(int argc, char *argv[], char *envp[])
 		/* name, create node, store in db */
 		retval = udev_add_device(&udev, class_dev);
 
-		/* run scripts */
-		dev_d_execute(&udev);
+		/* run dev.d/ scripts if we created a node or changed a netif name */
+		if (udev.devname[0] != '\0') {
+			setenv("DEVNAME", udev.devname, 1);
+			dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
+		}
 
 		sysfs_close_class_device(class_dev);
 		break;
@@ -196,11 +179,9 @@ int main(int argc, char *argv[], char *envp[])
 		retval = udev_remove_device(&udev);
 
 		/* run scripts */
-		dev_d_execute(&udev);
+		dev_d_execute(&udev, DEVD_DIR, DEVD_SUFFIX);
 	}
 
-	udevdb_exit();
-
 exit:
 	logging_close();
 	return retval;