X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=extras%2Frun_directory%2Fudev_run_hotplugd.c;h=f94c237e375503da256cc3bef2914571d53211ed;hp=463473d7c726a762cf9229e338983fc72c5322a3;hb=5016ef53f52feddb0beb202c7b4c0a299cd835bd;hpb=6a522681e1438bbd9c317654cc35d5d206d378ad

diff --git a/extras/run_directory/udev_run_hotplugd.c b/extras/run_directory/udev_run_hotplugd.c
index 463473d7c..f94c237e3 100644
--- a/extras/run_directory/udev_run_hotplugd.c
+++ b/extras/run_directory/udev_run_hotplugd.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,12 +53,10 @@ void log_message (int priority, const char *format, ...)
 
 int main(int argc, char *argv[], char *envp[])
 {
+	char dirname[NAME_SIZE];
 	const char *subsystem;
 	int fd;
 
-	if (getenv("DEVNAME") == NULL)
-		exit(0);
-
 	subsystem = argv[1];
 	logging_init("udev_run_hotplugd");
 
@@ -72,8 +68,10 @@ int main(int argc, char *argv[], char *envp[])
 		close(fd);
 	}
 
-	dbg("running dev.d directory");
+	dbg("running hotplug.d directory");
 
-	run_directory("/etc/hotplug.d", ".hotplug", subsystem);
+	sprintf(dirname, "/etc/hotplug.d/%s", subsystem);
+	run_directory(dirname, ".hotplug", subsystem);
+	run_directory("/etc/hotplug.d/default", ".hotplug", subsystem);
 	exit(0);
 }