X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=extras%2Frun_directory%2Fudev_run_hotplugd.c;h=f94c237e375503da256cc3bef2914571d53211ed;hb=1532b47bdf8cabc86d7e0f6d5e81342c42c48b2a;hp=54b6bf44e30458835c0d985b5a082d5f401b67ea;hpb=972d318a3123b00d0ed6b78bbcf70a0965841a8e;p=elogind.git

diff --git a/extras/run_directory/udev_run_hotplugd.c b/extras/run_directory/udev_run_hotplugd.c
index 54b6bf44e..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,6 +53,7 @@ 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;
 
@@ -69,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);
 }