X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Frun_directory%2Fudev_run_devd.c;h=59ea766ac28578d5af759d7fa366c89763160d3e;hb=64e6d9dd705f418307fb474a5185d31470f21989;hp=02bbc8c353e4228ac384eff525abf22155693aa7;hpb=972d318a3123b00d0ed6b78bbcf70a0965841a8e;p=elogind.git

diff --git a/extras/run_directory/udev_run_devd.c b/extras/run_directory/udev_run_devd.c
index 02bbc8c35..59ea766ac 100644
--- a/extras/run_directory/udev_run_devd.c
+++ b/extras/run_directory/udev_run_devd.c
@@ -22,11 +22,9 @@
 #include <sys/wait.h>
 #include <sys/stat.h>
 
-#include "../../udev_utils.h"
-#include "../../list.h"
-#include "../../logging.h"
+#include "../../udev.h"
+#include "run_directory.h"
 
-extern int run_directory(const char *dir, const char *suffix, const char *subsystem);
 
 #ifdef USE_LOG
 void log_message (int priority, const char *format, ...)
@@ -55,11 +53,25 @@ void log_message (int priority, const char *format, ...)
 
 int main(int argc, char *argv[], char *envp[])
 {
+	char dirname[NAME_SIZE];
+	const char *devname;
+	const char *my_devname;
 	const char *subsystem;
 	int fd;
 
-	if (getenv("DEVNAME") == NULL)
+	devname = getenv("DEVNAME");
+	if (devname == NULL)
 		exit(0);
+	/*
+	 * Hack, we are assuming that the device nodes are in /dev,
+	 * if not, this will not work, but you should be using the
+	 * RUN= rule anyway...
+	 */
+	my_devname = strstr(devname, "/dev/");
+	if (my_devname != NULL)
+		my_devname = &my_devname[5];
+	else
+		my_devname = devname;
 
 	subsystem = argv[1];
 	logging_init("udev_run_devd");
@@ -73,6 +85,11 @@ int main(int argc, char *argv[], char *envp[])
 	}
 	dbg("running dev.d directory");
 
-	run_directory("/etc/dev.d", ".dev", subsystem);
+	sprintf(dirname, "/etc/dev.d/%s", my_devname);
+	run_directory(dirname, ".dev", subsystem);
+	sprintf(dirname, "/etc/dev.d/%s", subsystem);
+	run_directory(dirname, ".dev", subsystem);
+	run_directory("/etc/dev.d/default", ".dev", subsystem);
+
 	exit(0);
 }